Changeset 3229

Timestamp:

11/29/2005 01:43:32 AM (19 years ago)

Author:

ryan

Message:

Use the full page hierarchy when matching page URIs. Props David House. fixes #1964

Location:

trunk/wp-includes

Files:

• classes.php (modified) (4 diffs)
• functions.php (modified) (3 diffs)
• template-functions-post.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -258 +258 @@
         $whichcat = '';
         $whichauthor = '';
+        $whichpage = '';
         $result = '';
         $where = '';
@@ -351 +352 @@
             $where .= " AND post_name = '" . $q['name'] . "'";
         } else if ('' != $q['pagename']) {
-            $q['pagename'] = sanitize_title(basename(str_replace('%2F', '/', urlencode($q['pagename']))));
+            $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
+            $page_paths = '/' . trim($q['pagename'], '/');
+            $q['pagename'] = sanitize_title(basename($page_paths));
             $q['name'] = $q['pagename'];
-            $where .= " AND post_name = '" . $q['pagename'] . "'";
+            $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;
+                }
+            }
+            
+            $where .= " AND (ID = '$reqpage')";
         } elseif ('' != $q['attachment']) {
             $q['attachment'] = sanitize_title($q['attachment']);
@@ -512 +529 @@
             $whichauthor .= ' AND (post_author = '.intval($q['author']).')';
         }
-
+        
         $where .= $search.$whichcat.$whichauthor;
 
@@ -1467 +1484 @@
                 }
 
-                if (preg_match("!^$match!", $request_match, $matches)) {
+                if (preg_match("!^$match!", $request_match, $matches) ||
+                    preg_match("!^$match!", urldecode($request_match), $matches)) {
                     // Got a match.
                     $this->matched_rule = $match;

trunk/wp-includes/functions.php

@@ -586 +586 @@
 }
 
+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.
@@ -613 +627 @@
         }
     }
+    
+    if (!isset($_page->fullpath)) {
+        $_page = set_page_path($_page);
+        wp_cache_replace($_page->cat_ID, $_page, 'pages');
+    }
 
     if ( $output == OBJECT ) {
@@ -719 +738 @@
     
     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;
 }
 

trunk/wp-includes/template-functions-post.php

@@ -284 +284 @@
         }
     }
-
     return $page_list;
 }