Ticket #17737: 17737.diff

src/wp-includes/query.php

@@ -1471 +1471 @@
                 $qv['paged'] = absint($qv['paged']);
                 $qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
                 $qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
-                $qv['pagename'] = trim( $qv['pagename'] );
-                $qv['name'] = trim( $qv['name'] );
+                $qv['pagename'] = ! is_array( $qv['pagename'] ) ? trim( $qv['pagename'] ) : '';
+                $qv['name'] = ! is_array( $qv['name'] ) ? trim( $qv['name'] ) : '';
                 if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
                 if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
                 if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
@@ -1483 +1483 @@
                         $qv['s'] = '';
 
                 // Compat. Map subpost to attachment.
-                if ( '' != $qv['subpost'] )
+                if ( '' != $qv['subpost'] && ! is_array( $qv['subpost'] ) )
                         $qv['attachment'] = $qv['subpost'];
                 if ( '' != $qv['subpost_id'] )
                         $qv['attachment_id'] = $qv['subpost_id'];
@@ -1739 +1739 @@
                         if ( 'post_tag' == $taxonomy )
                                 continue;       // Handled further down in the $q['tag'] block
 
-                        if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+                        if ( $t->query_var && ! empty( $q[ $t->query_var ] ) && ! is_array( $q[ $t->query_var ] ) ) {
                                 $tax_query_defaults = array(
                                         'taxonomy' => $taxonomy,
                                         'field' => 'slug',
@@ -1767 +1767 @@
                 }
 
                 // Category stuff
-                if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
-                        $q['cat'] = ''.urldecode($q['cat']).'';
+                if ( ! empty( $q['cat'] ) && ! is_array( $q['cat'] ) && '0' != $q['cat'] && ! $this->is_singular && $this->query_vars_changed ) {
+                        $q['cat'] = urldecode($q['cat']);
                         $q['cat'] = addslashes_gpc($q['cat']);
                         $cat_array = preg_split('/[,\s]+/', $q['cat']);
                         $q['cat'] = '';
@@ -1829 +1829 @@
                 }
 
                 // Tag stuff
-                if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
+                if ( '' != $q['tag'] && ! is_array( $q['tag'] ) && ! $this->is_singular && $this->query_vars_changed ) {
                         if ( strpos($q['tag'], ',') !== false ) {
                                 $tags = preg_split('/[,\r\n\t ]+/', $q['tag']);
                                 foreach ( (array) $tags as $tag ) {
@@ -2243 +2243 @@
                         $q['page_id'] = get_option('page_on_front');
                 }
 
-                if ( isset($q['page']) ) {
+                if ( isset( $q['page'] ) && ! is_array( $q['page'] ) ) {
                         $q['page'] = trim($q['page'], '/');
                         $q['page'] = absint($q['page']);
                 }
@@ -2425 +2425 @@
                 }
 
                 // If a search pattern is specified, load the posts that match.
-                if ( ! empty( $q['s'] ) )
+                if ( ! empty( $q['s'] ) && ! is_array( $q['s'] ) )
                         $search = $this->parse_search( $q );
 
                 // Taxonomies
@@ -2513 +2513 @@
 
                 // Author/user stuff
 
-                if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {
-                        $q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
+                if ( ! empty( $q['author'] ) && ! is_array( $q['author'] ) && $q['author'] != '0' ) {
+                        $q['author'] = addslashes_gpc( urldecode( $q['author'] ) );
                         $authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
                         foreach ( $authors as $author ) {
                                 $key = $author > 0 ? 'author__in' : 'author__not_in';
@@ -2533 +2533 @@
 
                 // Author stuff for nice URLs
 
-                if ( '' != $q['author_name'] ) {
+                if ( '' != $q['author_name'] && ! is_array( $q['author_name'] ) ) {
                         if ( strpos($q['author_name'], '/') !== false ) {
                                 $q['author_name'] = explode('/', $q['author_name']);
                                 if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
@@ -2556 +2556 @@
 
                 $where .= $search . $whichauthor . $whichmimetype;
 
-                if ( empty($q['order']) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC')) )
+                if ( empty( $q['order'] ) || is_array( $q['order'] ) || ! in_array( strtoupper( $q['order'] ), array( 'ASC', 'DESC' ) ) )
                         $q['order'] = 'DESC';
 
                 // Order by
                 if ( empty($q['orderby']) ) {
                         $orderby = "$wpdb->posts.post_date " . $q['order'];
-                } elseif ( 'none' == $q['orderby'] ) {
+                } elseif ( 'none' == $q['orderby'] || is_array( $q['orderby'] ) ) {
                         $orderby = '';
                 } elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
                         $orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";