<!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>[28410] trunk/src/wp-admin/includes/template.php: Eliminate use of `extract()` in `wp_terms_checklist()`.</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/28410">28410</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 03:08:46 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_terms_checklist()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/template.php (28409 => 28410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/template.php 2014-05-15 02:56:56 UTC (rev 28409)
+++ trunk/src/wp-admin/includes/template.php 2014-05-15 03:08:46 UTC (rev 28410)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> * @param int $post_id
</span><span class="cx"> * @param array $args
</span><span class="cx"> */
</span><del>-function wp_terms_checklist($post_id = 0, $args = array()) {
</del><ins>+function wp_terms_checklist( $post_id = 0, $args = array() ) {
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'descendants_and_self' => 0,
</span><span class="cx"> 'selected_cats' => false,
</span><span class="lines">@@ -156,41 +156,55 @@
</span><span class="cx"> * @param array $args An array of arguments.
</span><span class="cx"> * @param int $post_id The post ID.
</span><span class="cx"> */
</span><del>- $args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
</del><ins>+ $params = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
</ins><span class="cx">
</span><del>- extract( wp_parse_args($args, $defaults), EXTR_SKIP );
</del><ins>+ $r = wp_parse_args( $params, $defaults );
</ins><span class="cx">
</span><del>- if ( empty($walker) || !is_a($walker, 'Walker') )
</del><ins>+ if ( empty( $r['walker'] ) || ! is_a( $r['walker'], 'Walker' ) ) {
</ins><span class="cx"> $walker = new Walker_Category_Checklist;
</span><ins>+ } else {
+ $walker = $r['walker'];
+ }
</ins><span class="cx">
</span><del>- $descendants_and_self = (int) $descendants_and_self;
</del><ins>+ $taxonomy = $r['taxonomy'];
+ $descendants_and_self = (int) $r['descendants_and_self'];
</ins><span class="cx">
</span><del>- $args = array('taxonomy' => $taxonomy);
</del><ins>+ $args = array( 'taxonomy' => $taxonomy );
</ins><span class="cx">
</span><del>- $tax = get_taxonomy($taxonomy);
- $args['disabled'] = !current_user_can($tax->cap->assign_terms);
</del><ins>+ $tax = get_taxonomy( $taxonomy );
+ $args['disabled'] = ! current_user_can( $tax->cap->assign_terms );
</ins><span class="cx">
</span><del>- if ( is_array( $selected_cats ) )
- $args['selected_cats'] = $selected_cats;
- elseif ( $post_id )
- $args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
- else
</del><ins>+ if ( is_array( $r['selected_cats'] ) ) {
+ $args['selected_cats'] = $r['selected_cats'];
+ } elseif ( $post_id ) {
+ $args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
+ } else {
</ins><span class="cx"> $args['selected_cats'] = array();
</span><del>-
- if ( is_array( $popular_cats ) )
- $args['popular_cats'] = $popular_cats;
- else
- $args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
-
</del><ins>+ }
+ if ( is_array( $r['popular_cats'] ) ) {
+ $args['popular_cats'] = $r['popular_cats'];
+ } else {
+ $args['popular_cats'] = get_terms( $taxonomy, array(
+ 'fields' => 'ids',
+ 'orderby' => 'count',
+ 'order' => 'DESC',
+ 'number' => 10,
+ 'hierarchical' => false
+ ) );
+ }
</ins><span class="cx"> if ( $descendants_and_self ) {
</span><del>- $categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
</del><ins>+ $categories = (array) get_terms( $taxonomy, array(
+ 'child_of' => $descendants_and_self,
+ 'hierarchical' => 0,
+ 'hide_empty' => 0
+ ) );
</ins><span class="cx"> $self = get_term( $descendants_and_self, $taxonomy );
</span><span class="cx"> array_unshift( $categories, $self );
</span><span class="cx"> } else {
</span><del>- $categories = (array) get_terms($taxonomy, array('get' => 'all'));
</del><ins>+ $categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $checked_ontop ) {
</del><ins>+ if ( $r['checked_ontop'] ) {
</ins><span class="cx"> // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
</span><span class="cx"> $checked_categories = array();
</span><span class="cx"> $keys = array_keys( $categories );
</span><span class="lines">@@ -203,10 +217,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Put checked cats on top
</span><del>- echo call_user_func_array(array(&$walker, 'walk'), array($checked_categories, 0, $args));
</del><ins>+ echo call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
</ins><span class="cx"> }
</span><span class="cx"> // Then the rest of them
</span><del>- echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args));
</del><ins>+ echo call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>