<!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" />
<title>[28465] trunk/src/wp-includes/taxonomy.php: Eliminate the use of `extract()` in `get_terms()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28465">28465</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-17 14:46:07 +0000 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate the use of `extract()` in `get_terms()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/taxonomy.php (28464 => 28465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2014-05-17 14:15:40 UTC (rev 28464)
+++ trunk/src/wp-includes/taxonomy.php 2014-05-17 14:46:07 UTC (rev 28465)
</span><span class="lines">@@ -1279,13 +1279,14 @@
</span><span class="cx"> * @param string|array $args The values of what to search for when returning terms
</span><span class="cx"> * @return array|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies do not exist.
</span><span class="cx"> */
</span><del>-function get_terms($taxonomies, $args = '') {
</del><ins>+function get_terms( $taxonomies, $args = '' ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx"> $empty_array = array();
</span><span class="cx">
</span><span class="cx"> $single_taxonomy = ! is_array( $taxonomies ) || 1 === count( $taxonomies );
</span><del>- if ( ! is_array( $taxonomies ) )
</del><ins>+ if ( ! is_array( $taxonomies ) ) {
</ins><span class="cx"> $taxonomies = array( $taxonomies );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> foreach ( $taxonomies as $taxonomy ) {
</span><span class="cx"> if ( ! taxonomy_exists($taxonomy) ) {
</span><span class="lines">@@ -1326,23 +1327,25 @@
</span><span class="cx"> */
</span><span class="cx"> $args = apply_filters( 'get_terms_args', $args, $taxonomies );
</span><span class="cx">
</span><del>- extract($args, EXTR_SKIP);
-
</del><ins>+ $child_of = $args['child_of'];
</ins><span class="cx"> if ( $child_of ) {
</span><span class="cx"> $hierarchy = _get_term_hierarchy( reset( $taxonomies ) );
</span><del>- if ( ! isset( $hierarchy[ $child_of ] ) )
</del><ins>+ if ( ! isset( $hierarchy[ $child_of ] ) ) {
</ins><span class="cx"> return $empty_array;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ $parent = $args['parent'];
</ins><span class="cx"> if ( $parent ) {
</span><span class="cx"> $hierarchy = _get_term_hierarchy( reset( $taxonomies ) );
</span><del>- if ( ! isset( $hierarchy[ $parent ] ) )
</del><ins>+ if ( ! isset( $hierarchy[ $parent ] ) ) {
</ins><span class="cx"> return $empty_array;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // $args can be whatever, only use the args defined in defaults to compute the key
</span><span class="cx"> $filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
</span><del>- $key = md5( serialize( compact(array_keys($defaults)) ) . serialize( $taxonomies ) . $filter_key );
</del><ins>+ $key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $defaults ) ) ) . serialize( $taxonomies ) . $filter_key );
</ins><span class="cx"> $last_changed = wp_cache_get( 'last_changed', 'terms' );
</span><span class="cx"> if ( ! $last_changed ) {
</span><span class="cx"> $last_changed = microtime();
</span><span class="lines">@@ -1365,22 +1368,22 @@
</span><span class="cx"> return $cache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $_orderby = strtolower($orderby);
- if ( 'count' == $_orderby )
</del><ins>+ $_orderby = strtolower( $args['orderby'] );
+ if ( 'count' == $_orderby ) {
</ins><span class="cx"> $orderby = 'tt.count';
</span><del>- else if ( 'name' == $_orderby )
</del><ins>+ } else if ( 'name' == $_orderby ) {
</ins><span class="cx"> $orderby = 't.name';
</span><del>- else if ( 'slug' == $_orderby )
</del><ins>+ } else if ( 'slug' == $_orderby ) {
</ins><span class="cx"> $orderby = 't.slug';
</span><del>- else if ( 'term_group' == $_orderby )
</del><ins>+ } else if ( 'term_group' == $_orderby ) {
</ins><span class="cx"> $orderby = 't.term_group';
</span><del>- else if ( 'none' == $_orderby )
</del><ins>+ } else if ( 'none' == $_orderby ) {
</ins><span class="cx"> $orderby = '';
</span><del>- elseif ( empty($_orderby) || 'id' == $_orderby )
</del><ins>+ } elseif ( empty($_orderby) || 'id' == $_orderby ) {
</ins><span class="cx"> $orderby = 't.term_id';
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $orderby = 't.name';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the ORDERBY clause of the terms query.
</span><span class="cx"> *
</span><span class="lines">@@ -1392,16 +1395,23 @@
</span><span class="cx"> */
</span><span class="cx"> $orderby = apply_filters( 'get_terms_orderby', $orderby, $args, $taxonomies );
</span><span class="cx">
</span><del>- if ( !empty($orderby) )
</del><ins>+ $order = strtoupper( $args['order'] );
+ if ( ! empty( $orderby ) ) {
</ins><span class="cx"> $orderby = "ORDER BY $orderby";
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $order = '';
</span><ins>+ }
</ins><span class="cx">
</span><del>- $order = strtoupper( $order );
- if ( '' !== $order && !in_array( $order, array( 'ASC', 'DESC' ) ) )
</del><ins>+ if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
</ins><span class="cx"> $order = 'ASC';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
</span><ins>+
+ $exclude = $args['exclude'];
+ $exclude_tree = $args['exclude_tree'];
+ $include = $args['include'];
+
</ins><span class="cx"> $inclusions = '';
</span><span class="cx"> if ( ! empty( $include ) ) {
</span><span class="cx"> $exclude = '';
</span><span class="lines">@@ -1414,7 +1424,6 @@
</span><span class="cx"> $where .= $inclusions;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $exclusions = '';
</del><span class="cx"> if ( ! empty( $exclude_tree ) ) {
</span><span class="cx"> $exclude_tree = wp_parse_id_list( $exclude_tree );
</span><span class="cx"> $excluded_children = $exclude_tree;
</span><span class="lines">@@ -1425,18 +1434,22 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx"> $exclusions = implode( ',', array_map( 'intval', $excluded_children ) );
</span><ins>+ } else {
+ $exclusions = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $exclude ) ) {
</span><span class="cx"> $exterms = wp_parse_id_list( $exclude );
</span><del>- if ( empty( $exclusions ) )
</del><ins>+ if ( empty( $exclusions ) ) {
</ins><span class="cx"> $exclusions = implode( ',', $exterms );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $exclusions .= ', ' . implode( ',', $exterms );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! empty( $exclusions ) )
</del><ins>+ if ( ! empty( $exclusions ) ) {
</ins><span class="cx"> $exclusions = ' AND t.term_id NOT IN (' . $exclusions . ')';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the terms to exclude from the terms query.
</span><span class="lines">@@ -1449,21 +1462,22 @@
</span><span class="cx"> */
</span><span class="cx"> $exclusions = apply_filters( 'list_terms_exclusions', $exclusions, $args, $taxonomies );
</span><span class="cx">
</span><del>- if ( ! empty( $exclusions ) )
</del><ins>+ if ( ! empty( $exclusions ) ) {
</ins><span class="cx"> $where .= $exclusions;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( !empty($slug) ) {
- $slug = sanitize_title($slug);
</del><ins>+ if ( ! empty( $args['slug'] ) ) {
+ $slug = sanitize_title( $args['slug'] );
</ins><span class="cx"> $where .= " AND t.slug = '$slug'";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($name__like) ) {
- $name__like = like_escape( $name__like );
</del><ins>+ if ( ! empty( $args['name__like'] ) ) {
+ $name__like = like_escape( $args['name__like'] );
</ins><span class="cx"> $where .= $wpdb->prepare( " AND t.name LIKE %s", '%' . $name__like . '%' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! empty( $description__like ) ) {
- $description__like = like_escape( $description__like );
</del><ins>+ if ( ! empty( $args['description__like'] ) ) {
+ $description__like = like_escape( $args['description__like'] );
</ins><span class="cx"> $where .= $wpdb->prepare( " AND tt.description LIKE %s", '%' . $description__like . '%' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1472,29 +1486,35 @@
</span><span class="cx"> $where .= " AND tt.parent = '$parent'";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'count' == $fields )
</del><ins>+ $hierarchical = $args['hierarchical'];
+ if ( 'count' == $args['fields'] ) {
</ins><span class="cx"> $hierarchical = false;
</span><del>-
- if ( $hide_empty && !$hierarchical )
</del><ins>+ }
+ if ( $args['hide_empty'] && !$hierarchical ) {
</ins><span class="cx"> $where .= ' AND tt.count > 0';
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ $number = $args['number'];
+ $offset = $args['offset'];
+
</ins><span class="cx"> // don't limit the query results when we have to descend the family tree
</span><span class="cx"> if ( $number && ! $hierarchical && ! $child_of && '' === $parent ) {
</span><del>- if ( $offset )
</del><ins>+ if ( $offset ) {
</ins><span class="cx"> $limits = 'LIMIT ' . $offset . ',' . $number;
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $limits = 'LIMIT ' . $number;
</span><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> $limits = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! empty( $search ) ) {
- $search = like_escape( $search );
</del><ins>+ if ( ! empty( $args['search'] ) ) {
+ $search = like_escape( $args['search'] );
</ins><span class="cx"> $where .= $wpdb->prepare( ' AND ((t.name LIKE %s) OR (t.slug LIKE %s))', '%' . $search . '%', '%' . $search . '%' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $selects = array();
</span><del>- switch ( $fields ) {
</del><ins>+ switch ( $args['fields'] ) {
</ins><span class="cx"> case 'all':
</span><span class="cx"> $selects = array( 't.*', 'tt.*' );
</span><span class="cx"> break;
</span><span class="lines">@@ -1518,7 +1538,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $_fields = $fields;
</del><ins>+ $_fields = $args['fields'];
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the fields to select in the terms query.
</span><span class="lines">@@ -1545,20 +1565,18 @@
</span><span class="cx"> * @param array $args An array of terms query arguments.
</span><span class="cx"> */
</span><span class="cx"> $clauses = apply_filters( 'terms_clauses', compact( $pieces ), $taxonomies, $args );
</span><del>- foreach ( $pieces as $piece )
</del><ins>+ foreach ( $pieces as $piece ) {
</ins><span class="cx"> $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
</span><span class="cx">
</span><del>- $fields = $_fields;
-
- if ( 'count' == $fields ) {
</del><ins>+ if ( 'count' == $_fields ) {
</ins><span class="cx"> $term_count = $wpdb->get_var($query);
</span><span class="cx"> return $term_count;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $terms = $wpdb->get_results($query);
</span><del>- if ( 'all' == $fields ) {
</del><ins>+ if ( 'all' == $_fields ) {
</ins><span class="cx"> update_term_cache($terms);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1572,16 +1590,17 @@
</span><span class="cx">
</span><span class="cx"> if ( $child_of ) {
</span><span class="cx"> $children = _get_term_hierarchy( reset( $taxonomies ) );
</span><del>- if ( ! empty( $children ) )
</del><ins>+ if ( ! empty( $children ) ) {
</ins><span class="cx"> $terms = _get_term_children( $child_of, $terms, reset( $taxonomies ) );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Update term counts to include children.
</span><del>- if ( $pad_counts && 'all' == $fields )
</del><ins>+ if ( $args['pad_counts'] && 'all' == $_fields ) {
</ins><span class="cx"> _pad_term_counts( $terms, reset( $taxonomies ) );
</span><del>-
</del><ins>+ }
</ins><span class="cx"> // Make sure we show empty categories that have children.
</span><del>- if ( $hierarchical && $hide_empty && is_array( $terms ) ) {
</del><ins>+ if ( $hierarchical && $args['hide_empty'] && is_array( $terms ) ) {
</ins><span class="cx"> foreach ( $terms as $k => $term ) {
</span><span class="cx"> if ( ! $term->count ) {
</span><span class="cx"> $children = get_term_children( $term->term_id, reset( $taxonomies ) );
</span><span class="lines">@@ -1602,28 +1621,35 @@
</span><span class="cx"> reset( $terms );
</span><span class="cx">
</span><span class="cx"> $_terms = array();
</span><del>- if ( 'id=>parent' == $fields ) {
- while ( $term = array_shift( $terms ) )
</del><ins>+ if ( 'id=>parent' == $_fields ) {
+ while ( $term = array_shift( $terms ) ) {
</ins><span class="cx"> $_terms[$term->term_id] = $term->parent;
</span><del>- } elseif ( 'ids' == $fields ) {
- while ( $term = array_shift( $terms ) )
</del><ins>+ }
+ } elseif ( 'ids' == $_fields ) {
+ while ( $term = array_shift( $terms ) ) {
</ins><span class="cx"> $_terms[] = $term->term_id;
</span><del>- } elseif ( 'names' == $fields ) {
- while ( $term = array_shift( $terms ) )
</del><ins>+ }
+ } elseif ( 'names' == $_fields ) {
+ while ( $term = array_shift( $terms ) ) {
</ins><span class="cx"> $_terms[] = $term->name;
</span><del>- } elseif ( 'id=>name' == $fields ) {
- while ( $term = array_shift( $terms ) )
</del><ins>+ }
+ } elseif ( 'id=>name' == $_fields ) {
+ while ( $term = array_shift( $terms ) ) {
</ins><span class="cx"> $_terms[$term->term_id] = $term->name;
</span><del>- } elseif ( 'id=>slug' == $fields ) {
- while ( $term = array_shift( $terms ) )
</del><ins>+ }
+ } elseif ( 'id=>slug' == $_fields ) {
+ while ( $term = array_shift( $terms ) ) {
</ins><span class="cx"> $_terms[$term->term_id] = $term->slug;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! empty( $_terms ) )
</del><ins>+ if ( ! empty( $_terms ) ) {
</ins><span class="cx"> $terms = $_terms;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( $number && is_array( $terms ) && count( $terms ) > $number )
</del><ins>+ if ( $number && is_array( $terms ) && count( $terms ) > $number ) {
</ins><span class="cx"> $terms = array_slice( $terms, $offset, $number );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>