<!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>[35278] trunk/src/wp-includes: Widgets: revert [34376] and [34386] as pertains to the Categories widget supporting custom taxonomies.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35278">35278</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35278","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-20 04:56:57 +0000 (Tue, 20 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Widgets: revert <a href="https://core.trac.wordpress.org/changeset/34376">[34376]</a> and <a href="https://core.trac.wordpress.org/changeset/34386">[34386]</a> as pertains to the Categories widget supporting custom taxonomies.
Punting on 4th down.
See <a href="https://core.trac.wordpress.org/ticket/21165">#21165</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyfunctionsphp">trunk/src/wp-includes/taxonomy-functions.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetcategoriesphp">trunk/src/wp-includes/widgets/class-wp-widget-categories.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy-functions.php 2015-10-20 04:28:05 UTC (rev 35277)
+++ trunk/src/wp-includes/taxonomy-functions.php 2015-10-20 04:56:57 UTC (rev 35278)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * - name - general name for the taxonomy, usually plural. The same as and overridden by $tax->label. Default is Tags/Categories
</span><span class="cx" style="display: block; padding: 0 10px"> * - singular_name - name for one object of this taxonomy. Default is Tag/Category
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - select_name - prompt to select a taxonomy when using a dropdown list in the Categories widget. Default is 'Select Category'.
</del><span class="cx" style="display: block; padding: 0 10px"> * - search_items - Default is Search Tags/Search Categories
</span><span class="cx" style="display: block; padding: 0 10px"> * - popular_items - This string isn't used on hierarchical taxonomies. Default is Popular Tags
</span><span class="cx" style="display: block; padding: 0 10px"> * - all_items - Default is All Tags/All Categories
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +519,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nohier_vs_hier_defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'select_name' => array( null, __( 'Select Category' ) ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'popular_items' => array( __( 'Popular Tags' ), null ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetcategoriesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-categories.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-categories.php 2015-10-20 04:28:05 UTC (rev 35277)
+++ trunk/src/wp-includes/widgets/class-wp-widget-categories.php 2015-10-20 04:56:57 UTC (rev 35278)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Core class used to implement a Categories widget.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.4.0 Added support for other taxonomies.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,8 +40,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function widget( $args, $instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $first_dropdown = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_taxonomy = $this->_get_current_taxonomy( $instance );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,13 +52,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo $args['before_title'] . $title . $args['after_title'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tax = get_taxonomy( $current_taxonomy );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $cat_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_count' => $c,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'hierarchical' => $h,
- 'taxonomy' => $current_taxonomy,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'hierarchical' => $h
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $d ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_args['show_option_none'] = $tax->labels->select_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_args['show_option_none'] = __( 'Select Category' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_args['id'] = $dropdown_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +133,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['count'] = !empty($new_instance['count']) ? 1 : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance['taxonomy'] = stripslashes( $new_instance['taxonomy'] );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,25 +152,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $count = isset($instance['count']) ? (bool) $instance['count'] :false;
</span><span class="cx" style="display: block; padding: 0 10px"> $hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;
</span><span class="cx" style="display: block; padding: 0 10px"> $dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_taxonomy = $this->_get_current_taxonomy( $instance );
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <label for="<?php echo esc_attr( $this->get_field_id( 'taxonomy' ) ); ?>"><?php _e( 'Taxonomy:' ) ?></label>
- <select class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'taxonomy' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'taxonomy' ) ); ?>">
- <?php foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) : ?>
- <?php
- if ( ! $taxonomy->hierarchical || empty( $taxonomy->labels->name ) ) :
- continue;
- endif;
- ?>
- <option value="<?php echo esc_attr( $taxonomy->name ); ?>" <?php selected( $taxonomy->name, $current_taxonomy ) ?>><?php echo esc_html( $taxonomy->labels->name ); ?></option>
- <?php endforeach; ?>
- </select>
- </p>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,19 +167,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Retrieves the taxonomy for the current Categories widget instance.
- *
- * @since 4.4.0
- * @access public
- *
- * @param array $instance Current settings.
- * @return string Name of the current taxonomy if set, otherwise 'category'.
- */
- public function _get_current_taxonomy( $instance ) {
- if ( ! empty( $instance['taxonomy'] ) && taxonomy_exists( $instance['taxonomy'] ) ) {
- return $instance['taxonomy'];
- }
- return 'category';
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>