Changeset 6380

Timestamp:

12/14/2007 06:20:42 AM (19 years ago)

Author:

ryan

Message:

Faster page_rows() from hailin. see #5303

Location:

trunk

Files:

• wp-admin/edit-pages.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-includes/query.php (modified) (2 diffs)

trunk/wp-admin/edit-pages.php

@@ -69 +69 @@
 
 <?php
-wp("post_type=page&orderby=menu_order&what_to_show=posts$post_status_q&posts_per_page=-1&posts_per_archive_page=-1&order=asc");
+$query_str = "post_type=page&orderby=menu_order title&what_to_show=posts$post_status_q&posts_per_page=-1&posts_per_archive_page=-1&order=asc";
+$query_str = apply_filters('manage_pages_query', $query_str);
+wp($query_str);
 
 $all = !( $h2_search || $post_status_q );
@@ -86 +88 @@
   </thead>
   <tbody id="the-list" class="list:page">
-<?php page_rows(0, 0, $posts, $all); ?>
+  <?php page_rows($posts); ?>  
   </tbody>
 </table>

trunk/wp-admin/includes/template.php

@@ -226 +226 @@
 }
 
-function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) {
-        global $class, $post;
-
-        if (!$pages )
-                $pages = get_pages( 'sort_column=menu_order' );
-
-        if (! $pages )
-                return false;
-
-        foreach ( $pages as $post) {
-                setup_postdata( $post);
-                if ( $hierarchy && ($post->post_parent != $parent) )
-                        continue;
-
-                $post->post_title = wp_specialchars( $post->post_title );
-                $pad = str_repeat( '— ', $level );
-                $id = (int) $post->ID;
-                $class = ('alternate' == $class ) ? '' : 'alternate';
+/*
+ * display one row if the page doesn't have any children
+ * otherwise, display the row and its children in subsequent rows
+ */
+function display_page_row( $page, &$children_pages, $level = 0 ) {
+        global $post;
+        static $class;
+        
+        $post = $page;
+        setup_postdata($page);
+
+        $page->post_title = wp_specialchars( $page->post_title );
+        $pad = str_repeat( '— ', $level );
+        $id = (int) $page->ID;
+        $class = ('alternate' == $class ) ? '' : 'alternate';
+
 ?>
   <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'>
-    <th scope="row" style="text-align: center"><?php echo $post->ID; ?></th>
+    <th scope="row" style="text-align: center"><?php echo $page->ID; ?></th>
     <td>
-      <?php echo $pad; ?><?php the_title() ?>
+      <?php echo $pad; ?><?php the_title(); ?>
     </td>
     <td><?php the_author() ?></td>
-    <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td>
+    <td><?php if ( '0000-00-00 00:00:00' ==$page->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $page->post_modified ); ?></td>
     <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e( 'View' ); ?></a></td>
     <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td>
@@ -258 +256 @@
 
 <?php
-                if ( $hierarchy )
-                        page_rows( $id, $level + 1, $pages );
-        }
+
+        if ( ! $children_pages )
+                return true; 
+
+        for ( $i=0; $i < count($children_pages); $i++ ) {
+
+                $child = $children_pages[$i];
+                        
+                if ( $child->post_parent == $id ) {
+                array_splice($children_pages, $i, 1); 
+                        display_page_row($child, $children_pages, $level+1);
+                        $i--; 
+                }
+        }
+}
+
+/*
+ * displays pages in hierarchical order 
+ */
+function page_rows( $pages ) {
+        if ( ! $pages )
+                $pages = get_pages( 'sort_column=menu_order' );
+
+        if ( ! $pages )
+                return false;
+
+        // splice pages into two parts: those without parent and those with parent
+
+        $top_level_pages = array();
+        $children_pages  = array();
+
+        foreach ( $pages as $page ) {
+                if ( 0 == $page->post_parent )
+                        $top_level_pages[] = $page; 
+                else
+                        $children_pages[] = $page; 
+        }
+
+        foreach ( $top_level_pages as $page )
+                display_page_row($page, $children_pages, 0);
+        
+        /* 
+         * display the remaining children_pages which are orphans
+         * having orphan requires parental attention
+         */
+         if ( count($children_pages) > 0 ) {
+                $empty_array = array(); 
+                foreach ($children_pages as $orphan_page)
+                        display_page_row($orphan_page, $empty_array, 0);
+         }
 }
 
 function user_row( $user_object, $style = '' ) {
-        if ( !(is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
+        if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
                 $user_object = new WP_User( (int) $user_object );
         $email = $user_object->user_email;

trunk/wp-includes/query.php

@@ -1114 +1114 @@
                 } else {
                         // Used to filter values
-                        $allowed_keys = array('author', 'date', 'category', 'title', 'modified', 'menu_order');
+                        $allowed_keys = array('author', 'date', 'category', 'title', 'modified', 'menu_order', 'parent', 'ID');
                         $q['orderby'] = urldecode($q['orderby']);
                         $q['orderby'] = addslashes_gpc($q['orderby']);
@@ -1124 +1124 @@
                                 // Only allow certain values for safety
                                 $orderby = $orderby_array[$i];
-                                if ( 'menu_order' != $orderby )
+                                if ( !('menu_order' == $orderby || 'ID' == $orderby ))
                                         $orderby = 'post_' . $orderby;
                                 if ( in_array($orderby_array[$i], $allowed_keys) )
-                                        $q['orderby'] .= (($i == 0) ? '' : ',') . "$orderby {$q['order']}";
-                        }
+                                        $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
+                        }
+                        /* append ASC or DESC at the end */ 
+                        if ( !empty($q['orderby'])){
+                                $q['orderby'] .= " {$q['order']}";
+                        }
+                        
                         if ( empty($q['orderby']) )
                                 $q['orderby'] = 'post_date '.$q['order'];