<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11744] trunk/wp-includes/category-template.php: Fix wp_tag_cloud('order=
RAND'), don't pre-sort if filter 'tag_cloud_sort' is used to sort the tags,
props Joern_W, fixes #10393</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11744">11744</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-07-26 01:23:46 +0000 (Sun, 26 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix wp_tag_cloud('order=RAND'), don't pre-sort if filter 'tag_cloud_sort' is used to sort the tags, props Joern_W, fixes <a href="http://trac.wordpress.org/ticket/10393">#10393</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (11743 => 11744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2009-07-25 12:21:55 UTC (rev 11743)
+++ trunk/wp-includes/category-template.php 2009-07-26 01:23:46 UTC (rev 11744)
</span><span class="lines">@@ -573,8 +573,9 @@
</span><span class="cx"> * 'format' argument will format the tags in a UL HTML list. The array value for
</span><span class="cx"> * the 'format' argument will return in PHP array type format.
</span><span class="cx"> *
</span><del>- * The 'tag_cloud_sort' filter allows you to override the sorting done
- * by the 'orderby' argument; passed to the filter: $tags array and $args array.
</del><ins>+ * The 'tag_cloud_sort' filter allows you to override the sorting.
+ * Passed to the filter: $tags array and $args array, has to return the $tags array
+ * after sorting it.
</ins><span class="cx"> *
</span><span class="cx"> * The 'orderby' argument will accept 'name' or 'count' and defaults to 'name'.
</span><span class="cx"> * The 'order' is the direction to sort, defaults to 'ASC' and can be 'DESC' or
</span><span class="lines">@@ -604,37 +605,34 @@
</span><span class="cx">
</span><span class="cx"> if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
</span><span class="cx"> $body = 'return sprintf (
</span><del>- _n('.var_export($args['single_text'], true).', '.var_export($args['multiple_text'], true).', $count),
</del><ins>+ _n(' . var_export($args['single_text'], true) . ', ' . var_export($args['multiple_text'], true) . ', $count),
</ins><span class="cx"> number_format_i18n( $count ));';
</span><span class="cx"> $args['topic_count_text_callback'] = create_function('$count', $body);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><del>-
</del><span class="cx"> extract( $args );
</span><span class="cx">
</span><span class="cx"> if ( empty( $tags ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // SQL cannot save you; this is a second (potentially different) sort on a subset of data.
- if ( 'name' == $orderby )
- uasort( $tags, create_function('$a, $b', 'return strnatcasecmp($a->name, $b->name);') );
- else
- uasort( $tags, create_function('$a, $b', 'return ($a->count > $b->count);') );
</del><ins>+ $tags_sorted = apply_filters( 'tag_cloud_sort', $tags, $args );
+ if ( $tags_sorted != $tags ) { // the tags have been sorted by a plugin
+ $tags = $tags_sorted;
+ unset($tags_sorted);
+ } else {
+ if ( 'RAND' == $order ) {
+ shuffle($tags);
+ } else {
+ // SQL cannot save you; this is a second (potentially different) sort on a subset of data.
+ if ( 'name' == $orderby )
+ uasort( $tags, create_function('$a, $b', 'return strnatcasecmp($a->name, $b->name);') );
+ else
+ uasort( $tags, create_function('$a, $b', 'return ($a->count > $b->count);') );
</ins><span class="cx">
</span><del>- $tags = apply_filters( 'tag_cloud_sort', $tags, $args );
-
- if ( 'DESC' == $order )
- $tags = array_reverse( $tags, true );
- elseif ( 'RAND' == $order ) {
- $keys = (array) array_rand( $tags, count( $tags ) );
- $temp = array();
- foreach ( $keys as $key )
- $temp[$key] = $tags[$key];
-
- $tags = $temp;
- $temp = null;
- unset( $temp );
</del><ins>+ if ( 'DESC' == $order )
+ $tags = array_reverse( $tags, true );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $number > 0 )
</span></span></pre>
</div>
</div>
</body>
</html>