<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[13276] trunk/wp-includes/default-widgets.php:
Allow the Tag Cloud Widget to support non-tag taxonomies.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13276">13276</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-21 02:47:58 +0000 (Sun, 21 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow the Tag Cloud Widget to support non-tag taxonomies. Props Sivel. Fixes <a href="http://trac.wordpress.org/ticket/11612">#11612</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (13275 => 13276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-02-21 02:17:39 UTC (rev 13275)
+++ trunk/wp-includes/default-widgets.php 2010-02-21 02:47:58 UTC (rev 13276)
</span><span class="lines">@@ -976,28 +976,57 @@
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="cx"> extract($args);
</span><del>- $title = apply_filters('widget_title', empty($instance['title']) ? __('Tags') : $instance['title'], $instance, $this->id_base);
</del><ins>+ $current_taxonomy = $this->_get_current_taxonomy($instance);
+ if ( !empty($instance['title']) ) {
+ $title = $instance['title'];
+ } else {
+ if ( 'post_tag' == $current_taxonomy ) {
+ $title = __('Tags');
+ } else {
+ $tax = get_taxonomy($current_taxonomy);
+ $title = $tax->label;
+ }
+ }
+ $title = apply_filters('widget_title', $title, $instance, $this->id_base);
</ins><span class="cx">
</span><span class="cx"> echo $before_widget;
</span><span class="cx"> if ( $title )
</span><span class="cx"> echo $before_title . $title . $after_title;
</span><span class="cx"> echo '<div>';
</span><del>- wp_tag_cloud(apply_filters('widget_tag_cloud_args', array()));
</del><ins>+ wp_tag_cloud( apply_filters('widget_tag_cloud_args', array('taxonomy' => $current_taxonomy) ) );
</ins><span class="cx"> echo "</div>\n";
</span><span class="cx"> echo $after_widget;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="cx"> $instance['title'] = strip_tags(stripslashes($new_instance['title']));
</span><ins>+ $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
</ins><span class="cx"> return $instance;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function form( $instance ) {
</span><ins>+ $current_taxonomy = $this->_get_current_taxonomy($instance);
</ins><span class="cx"> ?>
</span><span class="cx"> <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
</span><span class="cx"> <input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php if (isset ( $instance['title'])) {echo esc_attr( $instance['title'] );} ?>" /></p>
</span><del>-<?php
</del><ins>+ <p><label for="<?php echo $this->get_field_id('taxonomy'); ?>"><?php _e('Taxonomy:') ?></label>
+ <select class="widefat" id="<?php echo $this->get_field_id('taxonomy'); ?>" name="<?php echo $this->get_field_name('taxonomy'); ?>">
+ <?php foreach ( get_object_taxonomies('post') as $taxonomy ) :
+ $tax = get_taxonomy($taxonomy);
+ if ( !$tax->show_tagcloud || empty($tax->label) )
+ continue;
+ ?>
+ <option value="<?php echo esc_attr($taxonomy) ?>" <?php selected($taxonomy, $current_taxonomy) ?>><?php echo $tax->label ?></option>
+ <?php endforeach; ?>
+ </select></p><?php
</ins><span class="cx"> }
</span><ins>+
+ function _get_current_taxonomy($instance) {
+ if ( !empty($instance['taxonomy']) && is_taxonomy($instance['taxonomy']) )
+ return $instance['taxonomy'];
+
+ return 'post_tag';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>