<!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>[15686] trunk/wp-includes: Split wp_filter_object_list()
into wp_list_filter() and wp_list_pluck().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15686">15686</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-02 18:48:51 +0000 (Sat, 02 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split wp_filter_object_list() into wp_list_filter() and wp_list_pluck(). Fixes <a href="http://trac.wordpress.org/ticket/15016">#15016</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15685 => 15686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-10-02 18:03:06 UTC (rev 15685)
+++ trunk/wp-includes/functions.php 2010-10-02 18:48:51 UTC (rev 15686)
</span><span class="lines">@@ -3019,26 +3019,37 @@
</span><span class="cx"> * @return array A list of objects or object fields
</span><span class="cx"> */
</span><span class="cx"> function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
</span><del>- if ( !is_array($list) )
- return array();
</del><ins>+ $list = wp_list_filter( $list, $args, $operator );
</ins><span class="cx">
</span><del>- if ( empty($args) )
- $args = array();
</del><ins>+ if ( $field )
+ $list = wp_list_pluck( $list, $field );
</ins><span class="cx">
</span><del>- if ( empty($args) && !$field )
- return $list; // nothing to do
</del><ins>+ return $list;
+}
</ins><span class="cx">
</span><del>- $count = count($args);
</del><ins>+/**
+ * Filters a list of objects, based on a set of key => value arguments
+ *
+ * @since 3.1.0
+ *
+ * @param array $list An array of objects to filter
+ * @param array $args An array of key => value arguments to match against each object
+ * @param string $operator The logical operation to perform. 'or' means only one element
+ * from the array needs to match; 'and' means all elements must match. The default is 'and'.
+ * @return array
+ */
+function wp_list_filter( $list, $args = array(), $operator = 'and' ) {
+ if ( empty( $args ) )
+ return $list;
</ins><span class="cx">
</span><ins>+ $count = count( $args );
+
</ins><span class="cx"> $filtered = array();
</span><span class="cx">
</span><span class="cx"> foreach ( $list as $key => $obj ) {
</span><del>- $matched = count( array_intersect_assoc( (array) ($obj), $args ) );
</del><ins>+ $matched = count( array_intersect_assoc( (array) $obj, $args ) );
</ins><span class="cx"> if ( ('and' == $operator && $matched == $count) || ('or' == $operator && $matched <= $count) ) {
</span><del>- if ( $field )
- $filtered[] = $obj->$field;
- else
- $filtered[$key] = $obj;
</del><ins>+ $filtered[$key] = $obj;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3046,6 +3057,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Pluck a certain field out of each object in a list
+ *
+ * @since 3.1.0
+ *
+ * @param array $list A list of objects or arrays
+ * @param int|string $field A field from the object to place instead of the entire object
+ * @return array
+ */
+function wp_list_pluck( $list, $field ) {
+ foreach ( $list as $key => $value ) {
+ $value = (array) $value;
+ $list[ $key ] = $value[ $field ];
+ }
+
+ return $list;
+}
+
+/**
</ins><span class="cx"> * Determines if default embed handlers should be loaded.
</span><span class="cx"> *
</span><span class="cx"> * Checks to make sure that the embeds library hasn't already been loaded. If
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15685 => 15686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-02 18:03:06 UTC (rev 15685)
+++ trunk/wp-includes/query.php 2010-10-02 18:48:51 UTC (rev 15686)
</span><span class="lines">@@ -1951,7 +1951,7 @@
</span><span class="cx">
</span><span class="cx"> // Back-compat
</span><span class="cx"> if ( !empty( $ids ) ) {
</span><del>- $cat_query = wp_filter_object_list( $tax_query, array( 'taxonomy' => 'category' ) );
</del><ins>+ $cat_query = wp_list_filter( $tax_query, array( 'taxonomy' => 'category' ) );
</ins><span class="cx"> if ( !empty( $cat_query ) ) {
</span><span class="cx"> $cat_query = reset( $cat_query );
</span><span class="cx"> $cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
</span></span></pre>
</div>
</div>
</body>
</html>