Changeset 17452

Timestamp:

02/15/2011 11:58:42 PM (14 years ago)

Author:

ryan

Message:

Run parse_query() in get_posts() so that the query vars are always parsed for set(), get_posts() patterns. fixes #16545 for 3.1

File:

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

branches/3.1/wp-includes/query.php

@@ -1313 +1313 @@
      */
     function parse_query_vars() {
-        $this->parse_query('');
+        $this->parse_query();
     }
 
@@ -1384 +1384 @@
      * @access public
      *
-     * @param string|array $query
-     */
-    function parse_query($query) {
-        if ( !empty($query) || !isset($this->query) ) {
+     * @param string|array $query Optional query.
+     */
+    function parse_query( $query =  '' ) {
+        if ( ! empty( $query ) ) {
             $this->init();
-            $this->query = $this->query_vars = wp_parse_args($query);
+            $this->query = $this->query_vars = wp_parse_args( $query );
+        } elseif ( ! isset( $this->query ) ) {
+            $this->query = $this->query_vars;
         }
 
@@ -1871 +1873 @@
     function &get_posts() {
         global $wpdb, $user_ID, $_wp_using_ext_object_cache;
+
+        $this->parse_query();
 
         do_action_ref_array('pre_get_posts', array(&$this));
@@ -2852 +2856 @@
      * @return array List of posts.
      */
-    function &query($query) {
-        $this->parse_query($query);
+    function &query( $query ) {
+        $this->init();
+        $this->query = $this->query_vars = wp_parse_args( $query );
         return $this->get_posts();
     }