<!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>[28435] trunk/src/wp-includes/category-template.php: Eliminate use of `extract()` in `wp_generate_tag_cloud()`.</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/28435">28435</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 17:47:21 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_generate_tag_cloud()`.
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 (28434 => 28435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/category-template.php 2014-05-15 17:27:18 UTC (rev 28434)
+++ trunk/src/wp-includes/category-template.php 2014-05-15 17:47:21 UTC (rev 28435)
</span><span class="lines">@@ -685,9 +685,8 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><del>- extract( $args, EXTR_SKIP );
</del><span class="cx">
</span><del>- $return = ( 'array' === $format ) ? array() : '';
</del><ins>+ $return = ( 'array' === $args['format'] ) ? array() : '';
</ins><span class="cx">
</span><span class="cx"> if ( empty( $tags ) ) {
</span><span class="cx"> return $return;
</span><span class="lines">@@ -729,37 +728,37 @@
</span><span class="cx"> $tags = $tags_sorted;
</span><span class="cx"> unset( $tags_sorted );
</span><span class="cx"> } else {
</span><del>- if ( 'RAND' === $order ) {
</del><ins>+ if ( 'RAND' === $args['order'] ) {
</ins><span class="cx"> shuffle( $tags );
</span><span class="cx"> } else {
</span><span class="cx"> // SQL cannot save you; this is a second (potentially different) sort on a subset of data.
</span><del>- if ( 'name' === $orderby ) {
</del><ins>+ if ( 'name' === $args['orderby'] ) {
</ins><span class="cx"> uasort( $tags, '_wp_object_name_sort_cb' );
</span><span class="cx"> } else {
</span><span class="cx"> uasort( $tags, '_wp_object_count_sort_cb' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'DESC' === $order ) {
</del><ins>+ if ( 'DESC' === $args['order'] ) {
</ins><span class="cx"> $tags = array_reverse( $tags, true );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $number > 0 )
- $tags = array_slice($tags, 0, $number);
</del><ins>+ if ( $args['number'] > 0 )
+ $tags = array_slice( $tags, 0, $args['number'] );
</ins><span class="cx">
</span><span class="cx"> $counts = array();
</span><span class="cx"> $real_counts = array(); // For the alt tag
</span><span class="cx"> foreach ( (array) $tags as $key => $tag ) {
</span><span class="cx"> $real_counts[ $key ] = $tag->count;
</span><del>- $counts[ $key ] = $topic_count_scale_callback($tag->count);
</del><ins>+ $counts[ $key ] = call_user_func( $args['topic_count_scale_callback'], $tag->count );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $min_count = min( $counts );
</span><span class="cx"> $spread = max( $counts ) - $min_count;
</span><span class="cx"> if ( $spread <= 0 )
</span><span class="cx"> $spread = 1;
</span><del>- $font_spread = $largest - $smallest;
</del><ins>+ $font_spread = $args['largest'] - $args['smallest'];
</ins><span class="cx"> if ( $font_spread < 0 )
</span><span class="cx"> $font_spread = 1;
</span><span class="cx"> $font_step = $font_spread / $spread;
</span><span class="lines">@@ -776,15 +775,15 @@
</span><span class="cx"> if ( $translate_nooped_plural ) {
</span><span class="cx"> $title_attribute = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) );
</span><span class="cx"> } else {
</span><del>- $title_attribute = call_user_func( $topic_count_text_callback, $real_count, $tag, $args );
</del><ins>+ $title_attribute = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( $title_attribute ) . "' style='font-size: " .
</span><del>- str_replace( ',', '.', ( $smallest + ( ( $count - $min_count ) * $font_step ) ) )
- . "$unit;'>$tag_name</a>";
</del><ins>+ str_replace( ',', '.', ( $args['smallest'] + ( ( $count - $min_count ) * $font_step ) ) )
+ . $args['unit'] . ";'>$tag_name</a>";
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- switch ( $format ) :
</del><ins>+ switch ( $args['format'] ) :
</ins><span class="cx"> case 'array' :
</span><span class="cx"> $return =& $a;
</span><span class="cx"> break;
</span><span class="lines">@@ -794,11 +793,11 @@
</span><span class="cx"> $return .= "</li>\n</ul>\n";
</span><span class="cx"> break;
</span><span class="cx"> default :
</span><del>- $return = join( $separator, $a );
</del><ins>+ $return = join( $args['separator'], $a );
</ins><span class="cx"> break;
</span><span class="cx"> endswitch;
</span><span class="cx">
</span><del>- if ( $filter ) {
</del><ins>+ if ( $args['filter'] ) {
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the generated output of a tag cloud.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>