Ticket #56689: 56689.2.diff

src/wp-includes/post.php

@@ -5704 +5704 @@
                 }
         }
 
-        $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 );
+        $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 );
 
-        $in_string = "'" . implode( "','", $escaped_parts ) . "'";
-
         if ( is_array( $post_type ) ) {
                 $post_types = $post_type;
         } else {
@@ -5719 +5716 @@
                 $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)
-        ";
+        /*
+         * Perform a direct SQL query when called from 'pre_get_posts',
+         * to avoid an infinite loop. Otherwise, use WP_Query.
+         */
+        if ( doing_action( 'pre_get_posts' ) ) {
+                $escaped_parts = esc_sql( $parts );
+                $in_string     = "'" . implode( "','", $escaped_parts ) . "'";
 
-        $pages = $wpdb->get_results( $sql, OBJECT_K );
+                $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)
+                ";
 
+                $pages = (array) $wpdb->get_results( $sql, OBJECT_K );
+        } else {
+                $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',
+                );
+
+                $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;