Changeset 6380 for trunk/wp-includes/query.php

Timestamp:

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

Author:

ryan

Message:

Faster page_rows() from hailin. see #5303

File:

• trunk/wp-includes/query.php (modified) (2 diffs)

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'];