Ticket #1964: fix-sameslug-pages.diff

wp-includes/template-functions-post.php

@@ -283 +283 @@
                                 $page_list = array_merge($page_list, $children);
                 }
         }
-
         return $page_list;
 }
 

wp-includes/classes.php

@@ -257 +257 @@
                 // First let's clear some variables
                 $whichcat = '';
                 $whichauthor = '';
+                $whichpage = '';
                 $result = '';
                 $where = '';
                 $limits = '';
@@ -350 +351 @@
                         $q['name'] = sanitize_title($q['name']);
                         $where .= " AND post_name = '" . $q['name'] . "'";
                 } else if ('' != $q['pagename']) {
-                        $q['pagename'] = sanitize_title(basename(str_replace('%2F', '/', urlencode($q['pagename']))));
                         $q['name'] = $q['pagename'];
-                        $where .= " AND post_name = '" . $q['pagename'] . "'";
                 } elseif ('' != $q['attachment']) {
                         $q['attachment'] = sanitize_title($q['attachment']);
                         $q['name'] = $q['attachment'];
@@ -511 +510 @@
                         $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
                         $whichauthor .= ' AND (post_author = '.intval($q['author']).')';
                 }
+                
+                //Page stuff
+                if ($this->is_page) {
+                        $page_paths = '/' . trim(urldecode($q['pagename']), '/');
+                        $q['pagename'] = sanitize_title(basename($page_paths));
+                        $page_paths = explode('/', $page_paths);
+                        foreach($page_paths as $pathdir)
+                                $page_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
+                                
+                        $all_page_ids = get_all_page_ids();
+                        $reqpage = 0;                   
+                        foreach ( $all_page_ids as $page_id ) {
+                                $page = get_page($page_id);
+                                if ( $page->fullpath == $page_path ) {
+                                        $reqpage = $page_id;
+                                        break;
+                                }
+                        }
+                        
+                        $whichpage = " AND (ID = '$reqpage'";
+                        foreach (get_page_children($reqpage, get_pages()) as $child) {
+                                $whichpage .= " OR ID = '{$child->ID}' ";
+                        }
+                        $whichpage .= ")";
+                }
+                
+                $where .= $search.$whichcat.$whichauthor.$whichpage;
 
-                $where .= $search.$whichcat.$whichauthor;
-
                 if ((empty($q['order'])) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC'))) {
                         $q['order']='DESC';
                 }

wp-includes/functions.php

@@ -583 +583 @@
         }
 }
 
+function set_page_path($page) {
+        $page->fullpath = '/' . $page->post_name;
+        $path = $page->fullpath;
+        $curpage = $page;
+        while ($curpage->post_parent != 0) {
+                $curpage = get_page($curpage->post_parent);
+                $path = '/' . $curpage->post_name . $path;
+        }
+        
+        $page->fullpath = $path;
+
+        return $page;
+}
+
 // Retrieves page data given a page ID or page object.
 // Handles page caching.
 function &get_page(&$page, $output = OBJECT) {
@@ -610 +624 @@
                         wp_cache_add($_page->ID, $_page, 'pages');
                 }
         }
+        
+        if (!isset($_page->fullpath)) {
+                $_page = set_page_path($_page);
+                wp_cache_replace($_page->cat_ID, $_page, 'pages');
+        }
 
         if ( $output == OBJECT ) {
                 return $_page;
@@ -718 +737 @@
         return $cat_ids;
 }
 
+function get_all_page_ids() {
+        global $wpdb;
+        
+        if ( ! $page_ids = wp_cache_get('all_page_ids', 'posts') ) {
+                $page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_status='static'");
+                wp_cache_add('all_page_ids', $page_ids, 'pages');
+        }
+        
+        return $page_ids;
+}
+
 function gzip_compression() {
         if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') ) return false;
         if ( !get_settings('gzipcompression') ) return false;