<!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>[16018] trunk/wp-includes: Move get() and set()
methods from WP_Query to WP_Object_Query.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16018">16018</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-27 18:16:52 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move get() and set() methods from WP_Query to WP_Object_Query. See <a href="http://trac.wordpress.org/ticket/15032">#15032</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (16017 => 16018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-10-27 17:45:08 UTC (rev 16017)
+++ trunk/wp-includes/classes.php 2010-10-27 18:16:52 UTC (rev 16018)
</span><span class="lines">@@ -534,6 +534,44 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_Object_Query {
</span><span class="cx">
</span><ins>+ /**
+ * 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;
+ }
+
</ins><span class="cx"> /*
</span><span class="cx"> * Populates the $meta_query property
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (16017 => 16018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-10-27 17:45:08 UTC (rev 16017)
+++ trunk/wp-includes/comment.php 2010-10-27 18:16:52 UTC (rev 16018)
</span><span class="lines">@@ -192,9 +192,22 @@
</span><span class="cx"> return $query->query( $args );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * WordPress Comment Query class.
+ *
+ * @since 3.1.0
+ */
</ins><span class="cx"> class WP_Comment_Query extends WP_Object_Query {
</span><span class="cx">
</span><del>- function query( $args ) {
</del><ins>+ /**
+ * Execute the query
+ *
+ * @since 3.1.0
+ *
+ * @param string|array $query_vars
+ * @return int|array
+ */
+ function query( $query_vars ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="lines">@@ -215,9 +228,10 @@
</span><span class="cx"> 'count' => false
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $args = wp_parse_args( $args, $defaults );
- extract( $args, EXTR_SKIP );
</del><ins>+ $this->query_vars = wp_parse_args( $query_vars, $defaults );
</ins><span class="cx">
</span><ins>+ extract( $this->query_vars, EXTR_SKIP );
+
</ins><span class="cx"> // $args can be whatever, only use the args defined in defaults to compute the key
</span><span class="cx"> $key = md5( serialize( compact(array_keys($defaults)) ) );
</span><span class="cx"> $last_changed = wp_cache_get('last_changed', 'comment');
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16017 => 16018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-27 17:45:08 UTC (rev 16017)
+++ trunk/wp-includes/query.php 2010-10-27 18:16:52 UTC (rev 16018)
</span><span class="lines">@@ -658,9 +658,8 @@
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> */
</span><span class="cx"> class WP_Query extends WP_Object_Query {
</span><del>-
</del><span class="cx"> /**
</span><del>- * Query vars set by the user
</del><ins>+ * Initial query vars
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @access public
</span><span class="lines">@@ -669,15 +668,6 @@
</span><span class="cx"> var $query;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Query vars, after parsing
- *
- * @since 1.5.0
- * @access public
- * @var array
- */
- var $query_vars = array();
-
- /**
</del><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">@@ -1582,35 +1572,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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;
- }
-
- /**
</del><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>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16017 => 16018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-10-27 17:45:08 UTC (rev 16017)
+++ trunk/wp-includes/user.php 2010-10-27 18:16:52 UTC (rev 16018)
</span><span class="lines">@@ -374,12 +374,18 @@
</span><span class="cx"> function __construct( $query = null ) {
</span><span class="cx"> if ( !empty( $query ) ) {
</span><span class="cx"> $this->query_vars = wp_parse_args( $query, array(
</span><del>- 'role' => '', 'blog_id' => $GLOBALS['blog_id'],
- 'meta_key' => '', 'meta_value' => '', 'meta_compare' => '',
- 'include' => array(), 'exclude' => array(),
</del><ins>+ 'blog_id' => $GLOBALS['blog_id'],
+ 'role' => '',
+ 'meta_key' => '',
+ 'meta_value' => '',
+ 'meta_compare' => '',
+ 'include' => array(),
+ 'exclude' => array(),
</ins><span class="cx"> 'search' => '',
</span><del>- 'orderby' => 'login', 'order' => 'ASC',
- 'offset' => '', 'number' => '', 'count_total' => true,
</del><ins>+ 'orderby' => 'login',
+ 'order' => 'ASC',
+ 'offset' => '', 'number' => '',
+ 'count_total' => true,
</ins><span class="cx"> 'fields' => 'all',
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -1521,4 +1527,4 @@
</span><span class="cx"> return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>