From 449fdda55f41c8414b8308ebb51a0f08a2b38ce6 Mon Sep 17 00:00:00 2001 From: spacedmonkey Date: Tue, 31 Jan 2023 16:56:12 +0000 Subject: [PATCH] Query: Use `WP_Query` in `get_page_by_path`. Replace raw database queries in `get_page_by_path` with a call to `WP_Query` class. This has a number of benefits, including improved caching and priming of post caches. To maintain backwards compatibility, this function calls `WP_Query` to gets all matching posts of all post statuses. Props spacedmonkey, peterwilsoncc, costdev, Fixes #56689. Built from https://develop.svn.wordpress.org/trunk@55169 git-svn-id: http://core.svn.wordpress.org/trunk@54702 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/post.php | 62 +++++++++++++++-------------------------- wp-includes/version.php | 2 +- 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/wp-includes/post.php b/wp-includes/post.php index 7e3f47aba1..9f436775d7 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -5660,8 +5660,6 @@ function get_page( $page, $output = OBJECT, $filter = 'raw' ) { * * @since 2.1.0 * - * @global wpdb $wpdb WordPress database abstraction object. - * * @param string $page_path Page path. * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which * correspond to a WP_Post object, an associative array, or a numeric array, @@ -5670,30 +5668,11 @@ function get_page( $page, $output = OBJECT, $filter = 'raw' ) { * @return WP_Post|array|null WP_Post (or array) on success, or null on failure. */ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) { - global $wpdb; - - $last_changed = wp_cache_get_last_changed( 'posts' ); - - $hash = md5( $page_path . serialize( $post_type ) ); - $cache_key = "get_page_by_path:$hash:$last_changed"; - $cached = wp_cache_get( $cache_key, 'posts' ); - if ( false !== $cached ) { - // Special case: '0' is a bad `$page_path`. - if ( '0' === $cached || 0 === $cached ) { - return; - } else { - return get_post( $cached, $output ); - } - } - - $page_path = rawurlencode( urldecode( $page_path ) ); - $page_path = str_replace( '%2F', '/', $page_path ); - $page_path = str_replace( '%20', ' ', $page_path ); - $parts = explode( '/', trim( $page_path, '/' ) ); - $parts = array_map( 'sanitize_title_for_query', $parts ); - $escaped_parts = esc_sql( $parts ); - - $in_string = "'" . implode( "','", $escaped_parts ) . "'"; + $page_path = rawurlencode( urldecode( $page_path ) ); + $page_path = str_replace( '%2F', '/', $page_path ); + $page_path = str_replace( '%20', ' ', $page_path ); + $parts = explode( '/', trim( $page_path, '/' ) ); + $parts = array_map( 'sanitize_title_for_query', $parts ); if ( is_array( $post_type ) ) { $post_types = $post_type; @@ -5701,21 +5680,29 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) { $post_types = array( $post_type, 'attachment' ); } - $post_types = esc_sql( $post_types ); - $post_type_in_string = "'" . implode( "','", $post_types ) . "'"; - $sql = " - SELECT ID, post_name, post_parent, post_type - FROM $wpdb->posts - WHERE post_name IN ($in_string) - AND post_type IN ($post_type_in_string) - "; + $args = array( + 'post_name__in' => $parts, + 'post_type' => $post_types, + 'post_status' => 'all', + 'posts_per_page' => -1, + 'update_post_term_cache' => false, + 'update_post_meta_cache' => false, + 'no_found_rows' => true, + 'orderby' => 'none', + ); - $pages = $wpdb->get_results( $sql, OBJECT_K ); + $query = new WP_Query( $args ); + $posts = $query->get_posts(); + $pages = array(); + + foreach ( $posts as $post ) { + $pages[ $post->ID ] = $post; + } $revparts = array_reverse( $parts ); $foundid = 0; - foreach ( (array) $pages as $page ) { + foreach ( $pages as $page ) { if ( $page->post_name == $revparts[0] ) { $count = 0; $p = $page; @@ -5742,9 +5729,6 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) { } } - // We cache misses as well as hits. - wp_cache_set( $cache_key, $foundid, 'posts' ); - if ( $foundid ) { return get_post( $foundid, $output ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 87dc3dfc7b..cf27a225f0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-55168'; +$wp_version = '6.2-alpha-55169'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.