Changeset 15737

Timestamp:

10/06/2010 11:18:42 PM (16 years ago)

Author:

scribu

Message:

Proper handling of array query variables. Props loushou. Fixes #14330

File:

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

trunk/wp-includes/classes.php

@@ -275 +275 @@
 
                         if ( !empty( $this->query_vars[$wpvar] ) ) {
-                                $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
+                                if ( ! is_array( $this->query_vars[$wpvar] ) ) {
+                                        $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar]; 
+                                } else {
+                                        foreach ( $this->query_vars[$wpvar] as $vkey => $v )
+                                                $this->query_vars[$wpvar][$vkey] = (string) $v;
+                                }
+
                                 if ( isset( $taxonomy_query_vars[$wpvar] ) ) {
                                         $this->query_vars['taxonomy'] = $taxonomy_query_vars[$wpvar];
@@ -288 +294 @@
                 // Limit publicly queried post_types to those that are publicly_queryable
                 if ( isset( $this->query_vars['post_type']) ) {
-                        $queryable_post_types =  get_post_types( array('publicly_queryable' => true) );
-                        if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-                                unset( $this->query_vars['post_type'] );
+                        $queryable_post_types = get_post_types( array('publicly_queryable' => true) );
+                        if ( ! is_array( $this->query_vars['post_type'] ) ) {
+                                if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
+                                        unset( $this->query_vars['post_type'] );
+                        } else {
+                                $this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
+                        }
                 }