Changeset 17653

Timestamp:

04/18/2011 09:27:13 PM (15 years ago)

Author:

ryan

Message:

Don't pollute orderby query var. Props scribu. fixes #16844

File:

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

trunk/wp-includes/query.php

@@ -2292 +2292 @@
                 // Order by
                 if ( empty($q['orderby']) ) {
-                        $q['orderby'] = "$wpdb->posts.post_date " . $q['order'];
+                        $orderby = "$wpdb->posts.post_date " . $q['order'];
                 } elseif ( 'none' == $q['orderby'] ) {
-                        $q['orderby'] = '';
+                        $orderby = '';
                 } else {
                         // Used to filter values
@@ -2305 +2305 @@
                         $q['orderby'] = urldecode($q['orderby']);
                         $q['orderby'] = addslashes_gpc($q['orderby']);
-                        $orderby_array = explode(' ', $q['orderby']);
-                        $q['orderby'] = '';
-
-                        foreach ( $orderby_array as $i => $orderby ) {
+
+                        $orderby_array = array();
+                        foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
                                 // Only allow certain values for safety
                                 if ( ! in_array($orderby, $allowed_keys) )
@@ -2336 +2335 @@
                                 }
 
-                                $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'] = "$wpdb->posts.post_date ".$q['order'];
+                                $orderby_array[] = $orderby;
+                        }
+                        $orderby = implode( ',', $orderby_array );
+
+                        if ( empty( $orderby ) )
+                                $orderby = "$wpdb->posts.post_date ".$q['order'];
+                        else
+                                $orderby .= " {$q['order']}";
                 }
 
@@ -2542 +2540 @@
                                 $where = "AND 0";
                 }
-
-                $orderby = $q['orderby'];
 
                 $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );