<!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>[28432] trunk/src/wp-includes/category-template.php: Eliminate use of `extract()` in `wp_dropdown_categories()`.</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/28432">28432</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 15:47:43 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_dropdown_categories()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/category-template.php (28431 => 28432)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/category-template.php 2014-05-15 15:34:37 UTC (rev 28431)
+++ trunk/src/wp-includes/category-template.php 2014-05-15 15:47:43 UTC (rev 28432)
</span><span class="lines">@@ -344,28 +344,28 @@
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><del>- if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
</del><ins>+ if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
</ins><span class="cx"> $r['pad_counts'] = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- extract( $r );
</del><ins>+ $tab_index = $r['tab_index'];
</ins><span class="cx">
</span><span class="cx"> $tab_index_attribute = '';
</span><del>- if ( (int) $tab_index > 0 )
</del><ins>+ if ( (int) $tab_index > 0 ) {
</ins><span class="cx"> $tab_index_attribute = " tabindex=\"$tab_index\"";
</span><ins>+ }
+ $categories = get_terms( $r['taxonomy'], $r );
+ $name = esc_attr( $r['name'] );
+ $class = esc_attr( $r['class'] );
+ $id = $r['id'] ? esc_attr( $r['id'] ) : $name;
</ins><span class="cx">
</span><del>- $categories = get_terms( $taxonomy, $r );
- $name = esc_attr( $name );
- $class = esc_attr( $class );
- $id = $id ? esc_attr( $id ) : $name;
-
- if ( ! $r['hide_if_empty'] || ! empty($categories) )
</del><ins>+ if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
</ins><span class="cx"> $output = "<select name='$name' id='$id' class='$class' $tab_index_attribute>\n";
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $output = '';
</span><ins>+ }
+ if ( empty( $categories ) && ! $r['hide_if_empty'] && ! empty( $r['show_option_none'] ) ) {
</ins><span class="cx">
</span><del>- if ( empty($categories) && ! $r['hide_if_empty'] && !empty($show_option_none) ) {
-
</del><span class="cx"> /**
</span><span class="cx"> * Filter a taxonomy drop-down display element.
</span><span class="cx"> *
</span><span class="lines">@@ -380,39 +380,39 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $element Taxonomy element to list.
</span><span class="cx"> */
</span><del>- $show_option_none = apply_filters( 'list_cats', $show_option_none );
</del><ins>+ $show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
</ins><span class="cx"> $output .= "\t<option value='-1' selected='selected'>$show_option_none</option>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $categories ) ) {
</span><span class="cx">
</span><del>- if ( $show_option_all ) {
</del><ins>+ if ( $r['show_option_all'] ) {
</ins><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/category-template.php */
</span><del>- $show_option_all = apply_filters( 'list_cats', $show_option_all );
</del><ins>+ $show_option_all = apply_filters( 'list_cats', $r['show_option_all'] );
</ins><span class="cx"> $selected = ( '0' === strval($r['selected']) ) ? " selected='selected'" : '';
</span><span class="cx"> $output .= "\t<option value='0'$selected>$show_option_all</option>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $show_option_none ) {
</del><ins>+ if ( $r['show_option_none'] ) {
</ins><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/category-template.php */
</span><del>- $show_option_none = apply_filters( 'list_cats', $show_option_none );
</del><ins>+ $show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
</ins><span class="cx"> $selected = ( '-1' === strval($r['selected']) ) ? " selected='selected'" : '';
</span><span class="cx"> $output .= "\t<option value='-1'$selected>$show_option_none</option>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $hierarchical )
</del><ins>+ if ( $r['hierarchical'] ) {
</ins><span class="cx"> $depth = $r['depth']; // Walk the full depth.
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $depth = -1; // Flat.
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $output .= walk_category_dropdown_tree( $categories, $depth, $r );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $r['hide_if_empty'] || ! empty($categories) )
</del><ins>+ if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
</ins><span class="cx"> $output .= "</select>\n";
</span><del>-
</del><ins>+ }
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the taxonomy drop-down output.
</span><span class="cx"> *
</span><span class="lines">@@ -423,9 +423,9 @@
</span><span class="cx"> */
</span><span class="cx"> $output = apply_filters( 'wp_dropdown_cats', $output, $r );
</span><span class="cx">
</span><del>- if ( $echo )
</del><ins>+ if ( $r['echo'] ) {
</ins><span class="cx"> echo $output;
</span><del>-
</del><ins>+ }
</ins><span class="cx"> return $output;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>