Ticket #17065: 17065.4.diff

src/wp-includes/functions.php

@@ -3505 +3505 @@
  * Determine if the scheme of the given URL is https.
  *
  * @since 4.0.0
- * 
+ *
  * @param  string  $url The URL
  * @return bool True if the given URL uses https, false if not (or if the URL is not valid).
  */
@@ -4634 +4634 @@
                 return $var;
         }
 
-        if ( 'false' === $var ) {
+        if ( in_array( $var, array( 'off', 'no', 'false' ) ) ) {
                 return false;
         }
 

src/wp-includes/query.php

@@ -2200 +2200 @@
         }
 
         /**
+         * If the passed orderby value is allowed, convert the alias to a properly-prefixed orderby value
+         *
+         * @since 4.0.0
+         *
+         * @global wpdb $wpdb
+         * @param string $orderby Alias for the field to order by.
+         * @return string Table-prefixed value to used in the ORDER clause.
+         */
+        protected function parse_orderby( $orderby ) {
+                global $wpdb;
+
+                // Used to filter values
+                $allowed_keys = array( 'name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count', 'type' );
+                $meta_key = $this->get( 'meta_key' );
+                if ( ! empty( $meta_key ) ) {
+                        $allowed_keys[] = $meta_key;
+                        $allowed_keys[] = 'meta_value';
+                        $allowed_keys[] = 'meta_value_num';
+                }
+
+                if ( ! in_array( $orderby, $allowed_keys ) ) {
+                        return;
+                }
+
+                switch ( $orderby ) {
+                        case 'menu_order':
+                                $orderby = "$wpdb->posts.menu_order";
+                                break;
+                        case 'ID':
+                                $orderby = "$wpdb->posts.ID";
+                                break;
+                        case 'rand':
+                                $orderby = 'RAND()';
+                                break;
+                        case $meta_key:
+                        case 'meta_value':
+                                $type = $this->get( 'meta_type' );
+                                if ( ! empty( $type ) ) {
+                                        $meta_type = $this->meta_query->get_cast_for_type( $type );
+                                        $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
+                                } else {
+                                        $orderby = "$wpdb->postmeta.meta_value";
+                                }
+                                break;
+                        case 'meta_value_num':
+                                $orderby = "$wpdb->postmeta.meta_value+0";
+                                break;
+                        case 'comment_count':
+                                $orderby = "$wpdb->posts.comment_count";
+                                break;
+                        default:
+                                $orderby = "$wpdb->posts.post_" . $orderby;
+                }
+
+                return $orderby;
+        }
+
+        /**
          * Sets the 404 property and saves whether query is feed.
          *
          * @since 2.0.0
@@ -2706 +2764 @@
                         $q['order'] = 'DESC';
 
                 // Order by
-                if ( empty($q['orderby']) ) {
-                        $orderby = "$wpdb->posts.post_date " . $q['order'];
+                if ( empty( $q['orderby'] ) ) {
+                        // A deliberate empty array blanks out ORDER BY,
+                        // while leaving the value unset or otherwise empty sets the default.
+                        if ( isset( $q['orderby'] )
+                                && '' !== trim( $q['orderby'] )
+                                && ( false === wp_validate_boolean( $q['orderby'] ) || is_array( $q['orderby'] ) )
+                        ) {
+                                $orderby = '';
+                        } else {
+                                $orderby = "$wpdb->posts.post_date " . $q['order'];
+                        }
                 } elseif ( 'none' == $q['orderby'] ) {
                         $orderby = '';
                 } elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
@@ -2715 +2782 @@
                 } elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
                         $orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
                 } else {
-                        // Used to filter values
-                        $allowed_keys = array( 'name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count', 'type' );
-                        if ( !empty($q['meta_key']) ) {
-                                $allowed_keys[] = $q['meta_key'];
-                                $allowed_keys[] = 'meta_value';
-                                $allowed_keys[] = 'meta_value_num';
-                        }
-                        $q['orderby'] = urldecode($q['orderby']);
-                        $q['orderby'] = addslashes_gpc($q['orderby']);
-
                         $orderby_array = array();
-                        foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
-                                // Only allow certain values for safety
-                                if ( ! in_array($orderby, $allowed_keys) )
-                                        continue;
+                        if ( is_array( $q['orderby'] ) ) {
+                                foreach ( $q['orderby'] as $_orderby => $order ) {
+                                        $orderby = addslashes_gpc( urldecode( $_orderby ) );
+                                        $parsed = $this->parse_orderby( $orderby );
+                                        if ( ! $parsed ) {
+                                                continue;
+                                        }
+                                        $orderby_array[] = implode( ' ', array( $parsed, $order ) );
+                                }
+                                $orderby = implode( ', ', $orderby_array );
+                        } else {
+                                $q['orderby'] = urldecode($q['orderby']);
+                                $q['orderby'] = addslashes_gpc($q['orderby']);
 
-                                switch ( $orderby ) {
-                                        case 'menu_order':
-                                                $orderby = "$wpdb->posts.menu_order";
-                                                break;
-                                        case 'ID':
-                                                $orderby = "$wpdb->posts.ID";
-                                                break;
-                                        case 'rand':
-                                                $orderby = 'RAND()';
-                                                break;
-                                        case $q['meta_key']:
-                                        case 'meta_value':
-                                                if ( isset( $q['meta_type'] ) ) {
-                                                        $meta_type = $this->meta_query->get_cast_for_type( $q['meta_type'] );
-                                                        $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
-                                                } else {
-                                                        $orderby = "$wpdb->postmeta.meta_value";
-                                                }
-                                                break;
-                                        case 'meta_value_num':
-                                                $orderby = "$wpdb->postmeta.meta_value+0";
-                                                break;
-                                        case 'comment_count':
-                                                $orderby = "$wpdb->posts.comment_count";
-                                                break;
-                                        default:
-                                                $orderby = "$wpdb->posts.post_" . $orderby;
+                                foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
+                                        $parsed = $this->parse_orderby( $orderby );
+                                        // Only allow certain values for safety
+                                        if ( ! $parsed ) {
+                                                continue;
+                                        }
+
+                                        $orderby_array[] = $parsed;
                                 }
+                                $orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
 
-                                $orderby_array[] = $orderby;
+                                if ( empty( $orderby ) )
+                                        $orderby = "$wpdb->posts.post_date ".$q['order'];
+                                else
+                                        $orderby .= " {$q['order']}";
                         }
-                        $orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
-
-                        if ( empty( $orderby ) )
-                                $orderby = "$wpdb->posts.post_date ".$q['order'];
-                        else
-                                $orderby .= " {$q['order']}";
                 }
 
                 // Order search results by relevance only when another "orderby" is not specified in the query.

tests/phpunit/tests/post/query.php

@@ -761 +761 @@
                 $q3 = new WP_Query( array( 'post_status' => array( 'any', 'auto-draft' ) ) );
                 $this->assertNotContains( "post_status <> 'auto-draft'", $q3->request );
         }
+
+        /**
+         *
+         * @ticket 17065
+         */
+        function test_orderby_array() {
+                global $wpdb;
+
+                $q1 = new WP_Query( array(
+                        'orderby' => array(
+                                'type' => 'DESC',
+                                'name' => 'ASC'
+                        )
+                ) );
+                $this->assertContains(
+                        "ORDER BY $wpdb->posts.post_type DESC, $wpdb->posts.post_name ASC",
+                        $q1->request
+                );
+
+                $q2 = new WP_Query( array( 'orderby' => array() ) );
+                $this->assertNotContains( 'ORDER BY', $q2->request );
+                $this->assertNotContains( 'ORDER', $q2->request );
+
+                $q3 = new WP_Query( array( 'post_type' => 'post' ) );
+                $this->assertContains(
+                        "ORDER BY $wpdb->posts.post_date DESC",
+                        $q3->request
+                );
+        }
 }
+ No newline at end of file