Changeset 16352

Timestamp:

11/13/2010 06:26:15 PM (16 years ago)

Author:

scribu

Message:

Revert most of [16018]. See #15032

Location:

trunk/wp-includes

Files:

• class-wp-object-query.php (modified) (1 diff)
• query.php (modified) (3 diffs)

trunk/wp-includes/class-wp-object-query.php

@@ -9 +9 @@
  */
 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/query.php

@@ -690 +690 @@
  */
 class WP_Query extends WP_Object_Query {
-        /**
-         * Initial query vars
+
+        /**
+         * Query vars set by the user
          *
          * @since 1.5.0
@@ -698 +699 @@
          */
         var $query;
+
+        /**
+         * Query vars, after parsing
+         *
+         * @since 1.5.0
+         * @access public
+         * @var array
+         */
+        var $query_vars = array();
 
         /**
@@ -1605 +1615 @@
 
         /**
+         * 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.
          *