<!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>[15795] trunk/wp-includes/query.php:
  Sacrifice DRY for readability in WP_Query.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15795">15795</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-13 16:37:01 +0000 (Wed, 13 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Sacrifice DRY for readability in WP_Query. Props nacin for initial patch. See <a href="http://trac.wordpress.org/ticket/14997">#14997</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15794 => 15795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-10-13 15:49:26 UTC (rev 15794)
+++ trunk/wp-includes/query.php        2010-10-13 16:37:01 UTC (rev 15795)
</span><span class="lines">@@ -2183,21 +2183,23 @@
</span><span class="cx"> 
</span><span class="cx">                 $orderby = $q['orderby'];
</span><span class="cx"> 
</span><ins>+                $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+
</ins><span class="cx">                 // Apply post-paging filters on where and join.  Only plugins that
</span><span class="cx">                 // manipulate paging queries should use these hooks.
</span><span class="cx">                 if ( !$q['suppress_filters'] ) {
</span><del>-                        $var_config = array(
-                                'where'    =&gt; 'posts_where_paged',
-                                'groupby'  =&gt; 'posts_groupby',
-                                'join'     =&gt; 'posts_join_paged',
-                                'orderby'  =&gt; 'posts_orderby',
-                                'distinct' =&gt; 'posts_distinct',
-                                'limits'   =&gt; 'post_limits',
-                                'fields'   =&gt; 'posts_fields',
-                        );
-                        $var_values = compact( array_keys( $var_config ) );
-                        $result = $this-&gt;_filter_clause_variables( $var_config, $var_values, 'posts_clauses' );
-                        extract( $result );
</del><ins>+                        $where                = apply_filters_ref_array( 'posts_where_paged',        array( $where, &amp;$this ) );
+                        $groupby        = apply_filters_ref_array( 'posts_groupby',                array( $groupby, &amp;$this ) );
+                        $join                = apply_filters_ref_array( 'posts_join_paged',        array( $join, &amp;$this ) );
+                        $orderby        = apply_filters_ref_array( 'posts_orderby',                array( $orderby, &amp;$this ) );
+                        $distinct        = apply_filters_ref_array( 'posts_distinct',        array( $distinct, &amp;$this ) );
+                        $limits                = apply_filters_ref_array( 'post_limits',                array( $limits, &amp;$this ) );
+                        $fields                = apply_filters_ref_array( 'posts_fields',                array( $fields, &amp;$this ) );
+
+                        // Filter all clauses at once, for convenience
+                        $clauses = apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &amp;$this ) );
+                        foreach ( $pieces as $piece )
+                                $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 // Announce current selection parameters.  For use by caching plugins.
</span><span class="lines">@@ -2205,18 +2207,18 @@
</span><span class="cx"> 
</span><span class="cx">                 // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
</span><span class="cx">                 if ( !$q['suppress_filters'] ) {
</span><del>-                        $var_config = array(
-                                'where'    =&gt; 'posts_where_request',
-                                'groupby'  =&gt; 'posts_groupby_request',
-                                'join'     =&gt; 'posts_join_request',
-                                'orderby'  =&gt; 'posts_orderby_request',
-                                'distinct' =&gt; 'posts_distinct_request',
-                                'fields'   =&gt; 'posts_fields_request',
-                                'limits'   =&gt; 'post_limits_request',
-                        );
-                        $var_values = compact( array_keys( $var_config ) );
-                        $result = $this-&gt;_filter_clause_variables( $var_config, $var_values, 'posts_clauses_request' );
-                        extract( $result );
</del><ins>+                        $where                = apply_filters_ref_array( 'posts_where_request',                array( $where, &amp;$this ) );
+                        $groupby        = apply_filters_ref_array( 'posts_groupby_request',                array( $groupby, &amp;$this ) );
+                        $join                = apply_filters_ref_array( 'posts_join_request',                array( $join, &amp;$this ) );
+                        $orderby        = apply_filters_ref_array( 'posts_orderby_request',                array( $orderby, &amp;$this ) );
+                        $distinct        = apply_filters_ref_array( 'posts_distinct_request',        array( $distinct, &amp;$this ) );
+                        $fields                = apply_filters_ref_array( 'posts_fields_request',                array( $fields, &amp;$this ) );
+                        $limits                = apply_filters_ref_array( 'post_limits_request',                array( $limits, &amp;$this ) );
+
+                        // Filter all clauses at once, for convenience
+                        $clauses = apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &amp;$this ) );
+                        foreach ( $pieces as $piece )
+                                $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( ! empty($groupby) )
</span><span class="lines">@@ -2357,35 +2359,6 @@
</span><span class="cx"> 
</span><span class="cx">                 return $this-&gt;posts;
</span><span class="cx">         }
</span><del>-        
-        /**
-         * Filter clause variables based on configuration. Once per clause and 
-         * then all clauses at once.
-         * 
-         * @access private
-         * @param array $config filternames keyed with their variable names
-         * @param array $values values keyed with their variable names
-         * @param string $all_filter_name for the &quot;single filter&quot;
-         * @return array filtered values keyed with their names
-         */
-        function _filter_clause_variables( $config, $values, $all_filter_name ) {
-                $clauses = array();
-                foreach ( $config as $variable_name =&gt; $filter ) {
-                        $clauses[$variable_name] = apply_filters_ref_array( $filter, array( $values[$variable_name], &amp;$this ) );
-                }
-                // run filter for all clauses at once
-                $clauses = apply_filters_ref_array( $all_filter_name, array( $clauses, &amp;$this ) );
-                $is_array = is_array( $clauses );
-                $filtered = array();
-                foreach ( $config as $variable_name =&gt; $filter ) {
-                        if ( $is_array &amp;&amp; isset( $clauses[$variable_name] ) ) {
-                                $filtered[$variable_name] = $clauses[$variable_name];
-                        } else {
-                                $filtered[$variable_name] = '';
-                        }
-                }
-                return $filtered;
-        }
</del><span class="cx"> 
</span><span class="cx">         /**
</span><span class="cx">          * Set up the next post and iterate current post index.
</span></span></pre>
</div>
</div>

</body>
</html>