Changeset 16018

Timestamp:

10/27/2010 06:16:52 PM (16 years ago)

Author:

scribu

Message:

Move get() and set() methods from WP_Query to WP_Object_Query. See #15032

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• comment.php (modified) (2 diffs)
• query.php (modified) (3 diffs)
• user.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -535 +535 @@
 class WP_Object_Query {
 
+        /**
+         * Query vars, after parsing
+         *
+         * @since 3.1.0
+         * @access public
+         * @var array
+         */
+        var $query_vars;
+
+        /**
+         * Retrieve query variable.
+         *
+         * @since 3.1.0
+         * @access public
+         *
+         * @param string $query_var Query variable key.
+         * @return mixed
+         */
+        function get( $query_var ) {
+                if ( isset( $this->query_vars[$query_var] ) )
+                        return $this->query_vars[$query_var];
+
+                return '';
+        }
+
+        /**
+         * Set query variable.
+         *
+         * @since 3.1.0
+         * @access public
+         *
+         * @param string $query_var Query variable key.
+         * @param mixed $value Query variable value.
+         */
+        function set( $query_var, $value ) {
+                $this->query_vars[ $query_var ] = $value;
+        }
+
         /*
          * Populates the $meta_query property

trunk/wp-includes/comment.php

@@ -193 +193 @@
 }
 
+/**
+ * WordPress Comment Query class.
+ *
+ * @since 3.1.0
+ */
 class WP_Comment_Query extends WP_Object_Query {
 
-        function query( $args ) {
+        /**
+         * Execute the query
+         *
+         * @since 3.1.0
+         *
+         * @param string|array $query_vars
+         * @return int|array
+         */
+        function query( $query_vars ) {
                 global $wpdb;
 
@@ -216 +229 @@
                 );
 
-                $args = wp_parse_args( $args, $defaults );
-                extract( $args, EXTR_SKIP );
+                $this->query_vars = wp_parse_args( $query_vars, $defaults );
+
+                extract( $this->query_vars, EXTR_SKIP );
 
                 // $args can be whatever, only use the args defined in defaults to compute the key

trunk/wp-includes/query.php

@@ -659 +659 @@
  */
 class WP_Query extends WP_Object_Query {
-
-        /**
-         * Query vars set by the user
+        /**
+         * Initial query vars
          *
          * @since 1.5.0
@@ -668 +667 @@
          */
         var $query;
-
-        /**
-         * Query vars, after parsing
-         *
-         * @since 1.5.0
-         * @access public
-         * @var array
-         */
-        var $query_vars = array();
 
         /**
@@ -1583 +1573 @@
 
         /**
-         * Retrieve query variable.
-         *
-         * @since 1.5.0
-         * @access public
-         *
-         * @param string $query_var Query variable key.
-         * @return mixed
-         */
-        function get($query_var) {
-                if ( isset($this->query_vars[$query_var]) )
-                        return $this->query_vars[$query_var];
-
-                return '';
-        }
-
-        /**
-         * Set query variable.
-         *
-         * @since 1.5.0
-         * @access public
-         *
-         * @param string $query_var Query variable key.
-         * @param mixed $value Query variable value.
-         */
-        function set($query_var, $value) {
-                $this->query_vars[$query_var] = $value;
-        }
-
-        /**
          * Retrieve the posts based on query variables.
          *

trunk/wp-includes/user.php

@@ -375 +375 @@
                 if ( !empty( $query ) ) {
                         $this->query_vars = wp_parse_args( $query, array(
-                                'role' => '', 'blog_id' => $GLOBALS['blog_id'],
-                                'meta_key' => '', 'meta_value' => '', 'meta_compare' => '',
-                                'include' => array(), 'exclude' => array(),
+                                'blog_id' => $GLOBALS['blog_id'],
+                                'role' => '',
+                                'meta_key' => '', 
+                                'meta_value' => '',
+                                'meta_compare' => '',
+                                'include' => array(),
+                                'exclude' => array(),
                                 'search' => '',
-                                'orderby' => 'login', 'order' => 'ASC',
-                                'offset' => '', 'number' => '', 'count_total' => true,
+                                'orderby' => 'login',
+                                'order' => 'ASC',
+                                'offset' => '', 'number' => '',
+                                'count_total' => true,
                                 'fields' => 'all',
                         ) );