Changeset 2354

Timestamp:

02/16/2005 03:12:04 PM (22 years ago)

Author:

michelvaldrighi

Message:

added cache_pages to avoid making 1+X queries everytime wp_list_pages is called, where X is the number of pages

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/functions.php

@@ -942 +942 @@
 }
 
-function get_page_uri($page) {
-        global $wpdb;
-        $page = $wpdb->get_row("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = '$page'");
-
+function get_page_uri($page_id) {
+        global $wpdb, $cache_pages;
+
+        if (!isset($cache_pages[$page_id])) {
+                $cache_pages[$page_id] = $wpdb->get_row("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = '$page_id'");
+        }
+
+        $page = $cache_pages[$page_id];
         $uri = urldecode($page->post_name);
 

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

@@ -261 +261 @@
 
 function get_pages($args = '') {
-        global $wpdb;
-
-        parse_str($args, $r);
-
-        if (!isset($r['child_of'])) $r['child_of'] = 0;
-        if (!isset($r['sort_column'])) $r['sort_column'] = 'post_title';
-        if (!isset($r['sort_order'])) $r['sort_order'] = 'ASC';
-
-        $exclusions = '';
-        if (!empty($r['exclude'])) {
-                $expages = preg_split('/[\s,]+/',$r['exclude']);
-                if (count($expages)) {
-                        foreach ($expages as $expage) {
-                                $exclusions .= ' AND ID <> ' . intval($expage) . ' ';
+        global $wpdb, $cache_pages;
+
+        if (!isset($cache_pages) || empty($cache_pages)) {
+
+                parse_str($args, $r);
+
+                if (!isset($r['child_of'])) $r['child_of'] = 0;
+                if (!isset($r['sort_column'])) $r['sort_column'] = 'post_title';
+                if (!isset($r['sort_order'])) $r['sort_order'] = 'ASC';
+
+                $exclusions = '';
+                if (!empty($r['exclude'])) {
+                        $expages = preg_split('/[\s,]+/',$r['exclude']);
+                        if (count($expages)) {
+                                foreach ($expages as $expage) {
+                                        $exclusions .= ' AND ID <> ' . intval($expage) . ' ';
+                                }
                         }
                 }
-        }
-
-        $dates = ",UNIX_TIMESTAMP(post_modified) AS time_modified";
-        $dates .= ",UNIX_TIMESTAMP(post_date) AS time_created";
-
-        $post_parent = '';
-        if ($r['child_of']) {
-                $post_parent = ' AND post_parent=' . $r['child_of'] . ' ';
-        }
-
-        $pages = $wpdb->get_results("SELECT " .
-                                                                                                                        "ID, post_title,post_parent " .
-                                                                                                                        "$dates " .
-                                                                                                                        "FROM $wpdb->posts " .
-                                                                                                                        "WHERE post_status = 'static' " .
-                                                                                                                        "$post_parent" .
-                                                                                                                        "$exclusions " .
-                                                                                                                        "ORDER BY " . $r['sort_column'] . " " . $r['sort_order']);
-
-        return $pages;
+
+                $dates = ",UNIX_TIMESTAMP(post_modified) AS time_modified";
+                $dates .= ",UNIX_TIMESTAMP(post_date) AS time_created";
+        
+                $post_parent = '';
+                if ($r['child_of']) {
+                        $post_parent = ' AND post_parent=' . $r['child_of'] . ' ';
+                }
+        
+                $pages = $wpdb->get_results("SELECT " .
+                  "ID, post_title, post_name, post_parent " .
+                  "$dates " .
+                  "FROM $wpdb->posts " .
+                  "WHERE post_status = 'static' " .
+                  "$post_parent" .
+                  "$exclusions " .
+                  "ORDER BY " . $r['sort_column'] . " " . $r['sort_order']);
+
+                foreach($pages as $page) {
+                        $cache_pages[$page->ID] = $page;
+                }
+
+        }
+
+        return $cache_pages;
 }
 
@@ -318 +326 @@
                 // set the title for the current page
                 $page_tree[$page->ID]['title'] = $page->post_title;
+                $page_tree[$page->ID]['name'] = $page->post_name;
 
                 // set the selected date for the current page
@@ -336 +345 @@
                 // We can now start looping over the $page_tree array
                 // with any ID which will output the page links from that ID downwards.
-                $page_tree[$page->post_parent]['children'][] = $page->ID;       
+                $page_tree[$page->post_parent]['children'][] = $page->ID;
         }
         // Output of the pages starting with child_of as the root ID.