Changeset 3229

Timestamp:

11/29/05 01:43:32 (3 years ago)

Author:

ryan

Message:

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

Files:

• trunk/wp-includes/classes.php (modified) (4 diffs)
• trunk/wp-includes/functions.php (modified) (3 diffs)
• trunk/wp-includes/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['name'] = $q['pagename'];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } elseif ('' != $q['attachment']) {
-            $q['attachment'] = sanitize_title($q['attachment']);
@@ -512 +529 @@
-            $whichauthor .= ' AND (post_author = '.intval($q['author']).')';
-        }
-
+
-        $where .= $search.$whichcat.$whichauthor;
-
@@ -1467 +1484 @@
-                }
-
-
+
+
-                    // 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;
-}