<!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>[41987] trunk/src: Taxonomy: After [40984], add the `most_used` label for non-hierarchical taxonomies too, and use it on the Menus screen.</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/41987">41987</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/41987","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-24 11:21:47 +0000 (Tue, 24 Oct 2017)</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'>Taxonomy: After <a href="https://core.trac.wordpress.org/changeset/40984">[40984]</a>, add the `most_used` label for non-hierarchical taxonomies too, and use it on the Menus screen.
Props johnbillion.
Fixes <a href="https://core.trac.wordpress.org/ticket/41150">#41150</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2017-10-24 10:50:40 UTC (rev 41986)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2017-10-24 11:21:47 UTC (rev 41987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,7 +998,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="taxonomy-linkcategory" class="categorydiv">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="category-tabs" class="category-tabs">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="hide-if-no-js"><a href="#categories-pop"><?php _ex( 'Most Used', 'categories' ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="categories-all" class="tabs-panel">
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2017-10-24 10:50:40 UTC (rev 41986)
+++ trunk/src/wp-admin/includes/nav-menu.php 2017-10-24 11:21:47 UTC (rev 41987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,6 +607,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_name = $box['args']->name;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy = get_taxonomy( $taxonomy_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Paginate browsing for large numbers of objects.
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = 50;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,7 +683,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Most Used' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $taxonomy->labels->most_used ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2017-10-24 10:50:40 UTC (rev 41986)
+++ trunk/src/wp-includes/taxonomy.php 2017-10-24 11:21:47 UTC (rev 41987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,8 +488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * list tables.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $items_list_navigation Label for the table pagination hidden heading.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $items_list Label for the table hidden heading.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $most_used Title used for the Most Used panel. Not used for non-hierarchical
- * taxonomies. Default 'Most Used'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $most_used Title for the Most Used tab. Default 'Most Used'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $back_to_items Label displayed after a term has been updated.
</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">@@ -523,7 +522,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Tab heading when selecting from the most used terms */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'most_used' => array( null, _x( 'Most Used', 'Most used categories' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'most_used' => array( _x( 'Most Used', 'tags' ), _x( 'Most Used', 'categories' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'back_to_items' => array( __( '← Back to Tags' ), __( '← Back to Categories' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
</span></span></pre>
</div>
</div>
</body>
</html>