Changeset 2479

Timestamp:

03/27/2005 09:56:10 PM (20 years ago)

Author:

ryan

Message:

Split post and page caches.

Location:

trunk/wp-includes

Files:

• functions.php (modified) (4 diffs)
• template-functions-post.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -576 +576 @@
 }
 
+// Retrieves page data given a page ID or page object. 
+// Handles page caching.
+function &get_page(&$page, $output = OBJECT) {
+    global $page_cache, $wpdb;
+
+    if ( empty($page) ) {
+        if ( isset($GLOBALS['page']) )
+            $page = & $GLOBALS['page'];
+        else
+            $page = null;
+    } elseif (is_object($page) ) {
+        if (! isset($page_cache[$page->ID]))
+            $page_cache[$page->ID] = &$page;
+        $page = & $page_cache[$page->ID];
+    } else {
+        if ( isset($GLOBALS['page']) && ($page == $GLOBALS['page']->ID) )
+            $page = & $GLOBALS['page'];
+        elseif (isset($page_cache[$page]))
+            $page = & $page_cache[$page];
+        else {
+            $query = "SELECT * FROM $wpdb->posts WHERE ID=$page";
+            $page_cache[$page] = & $wpdb->get_row($query);
+            $page = & $page_cache[$page];
+        }
+    }
+
+    if ( $output == OBJECT ) {
+        return $page;
+    } elseif ( $output == ARRAY_A ) {
+        return get_object_vars($page);
+    } elseif ( $output == ARRAY_N ) {
+        return array_values(get_object_vars($page));
+    } else {
+        return $page;
+    }
+}
+
 // Retrieves category data given a category ID or category object. 
 // The category cache is fully populated by the blog header, so we don't
@@ -1047 +1084 @@
 
 function get_page_uri($page_id) {
-    $page = get_post($page_id);
+    $page = get_page($page_id);
     $uri = urldecode($page->post_name);
 
@@ -1056 +1093 @@
     
     while ($page->post_parent != 0) {
-        $page = get_post($page->post_parent);
+        $page = get_page($page->post_parent);
         $uri = urldecode($page->post_name) . "/" . $uri;
     }
@@ -1100 +1137 @@
     for ($i = 0; $i < count($posts); $i++) {
         $post_cache[$posts[$i]->ID] = &$posts[$i];
+    }
+}
+
+function update_page_cache(&$pages) {
+    global $page_cache;
+
+    if ( !$pages )
+        return;
+
+    for ($i = 0; $i < count($pages); $i++) {
+        $page_cache[$pages[$i]->ID] = &$pages[$i];
     }
 }

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

@@ -252 +252 @@
 
 function &get_pages($args = '') {
-    global $wpdb, $cache_pages;
+    global $wpdb, $page_cache;
 
     parse_str($args, $r);
@@ -282 +282 @@
                                                             "ORDER BY " . $r['sort_column'] . " " . $r['sort_order']);
 
+    if ( empty($pages) )
+        return array();
+
     // Update cache.
-    update_post_cache($pages);
-
-    if ( empty($pages) )
-        $pages = array();
+    update_page_cache($pages);
 
     return $pages;