<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16352] trunk/wp-includes: Revert most of [16018].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16352">16352</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-13 18:26:15 +0000 (Sat, 13 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert most of <a href="http://trac.wordpress.org/changeset/16018">[16018]</a>. See <a href="http://trac.wordpress.org/ticket/15032">#15032</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpobjectqueryphp">trunk/wp-includes/class-wp-object-query.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpobjectqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-object-query.php (16351 => 16352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-object-query.php 2010-11-13 18:18:45 UTC (rev 16351)
+++ trunk/wp-includes/class-wp-object-query.php 2010-11-13 18:26:15 UTC (rev 16352)
</span><span class="lines">@@ -8,45 +8,6 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> class WP_Object_Query {
</span><del>-
- /**
- * 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;
- }
-
</del><span class="cx"> /*
</span><span class="cx"> * Populates the $meta_query property
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16351 => 16352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-13 18:18:45 UTC (rev 16351)
+++ trunk/wp-includes/query.php 2010-11-13 18:26:15 UTC (rev 16352)
</span><span class="lines">@@ -689,8 +689,9 @@
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> */
</span><span class="cx"> class WP_Query extends WP_Object_Query {
</span><ins>+
</ins><span class="cx"> /**
</span><del>- * Initial query vars
</del><ins>+ * Query vars set by the user
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @access public
</span><span class="lines">@@ -699,6 +700,15 @@
</span><span class="cx"> var $query;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Query vars, after parsing
+ *
+ * @since 1.5.0
+ * @access public
+ * @var array
+ */
+ var $query_vars = array();
+
+ /**
</ins><span class="cx"> * Holds the data for a single object that is queried.
</span><span class="cx"> *
</span><span class="cx"> * Holds the contents of a post, page, category, attachment.
</span><span class="lines">@@ -1604,6 +1614,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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;
+ }
+
+ /**
</ins><span class="cx"> * Retrieve the posts based on query variables.
</span><span class="cx"> *
</span><span class="cx"> * There are a few filters and actions that can be used to modify the post
</span></span></pre>
</div>
</div>
</body>
</html>