<!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>[47747] trunk: Menus: Allow empty taxonomy terms to be surfaced when searching for items.</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 { white-space: pre-line; 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/47747">47747</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/47747","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-05-02 22:34:50 +0000 (Sat, 02 May 2020)</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'>Menus: Allow empty taxonomy terms to be surfaced when searching for items.
This brings the behaviour inline with that of browsing terms or using the All Items tab, which correctly shows empty terms.
Props birgire, audrasjb
Fixes <a href="https://core.trac.wordpress.org/ticket/45298">#45298</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusphp">trunk/tests/phpunit/tests/customize/nav-menus.php</a></li>
<li><a href="#trunktestsphpunittestsmenuwpAjaxMenuQuickSearchphp">trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2020-05-02 21:44:48 UTC (rev 47746)
+++ trunk/src/wp-admin/includes/nav-menu.php 2020-05-02 22:34:50 UTC (rev 47747)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,6 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $matches[2],
</span><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $query,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 10,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'hide_empty' => false,
</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 ( empty( $terms ) || is_wp_error( $terms ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-05-02 21:44:48 UTC (rev 47746)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-05-02 22:34:50 UTC (rev 47747)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,6 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomies' => $taxonomies,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $args['s'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 20,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'hide_empty' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 20 * ( $args['pagenum'] - 1 ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menus.php 2020-05-02 21:44:48 UTC (rev 47746)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2020-05-02 22:34:50 UTC (rev 47747)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 's' => 'cat',
</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">- $this->assertEquals( 1, count( $results ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 2, $results ); // Category terms Cats Drool and Uncategorized.
</ins><span class="cx" style="display: block; padding: 0 10px"> $count = $this->filter_count_customize_nav_menu_searched_items;
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_nav_menu_searched_items', array( $this, 'filter_search' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $menus->search_available_items_query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +382,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $count + 1, $this->filter_count_customize_nav_menu_searched_items );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $results );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 2, count( $results ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 3, $results );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'customize_nav_menu_searched_items', array( $this, 'filter_search' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test home.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,6 +398,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'custom', $results[0]['type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Tests that the search_available_items_query method should return term items
+ * not assigned to any posts.
+ *
+ * @ticket 45298
+ */
+ public function test_search_available_items_query_should_return_unassigned_term_items() {
+ $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+
+ register_taxonomy(
+ 'wptests_tax',
+ 'post',
+ array(
+ 'labels' => array(
+ 'name' => 'Tests Taxonomy',
+ ),
+ )
+ );
+
+ $term_id = $this->factory->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'name' => 'foobar',
+ )
+ );
+
+ // Expected menu item array.
+ $expected = array(
+ 'title' => 'foobar',
+ 'id' => "term-{$term_id}",
+ 'type' => 'taxonomy',
+ 'type_label' => 'Tests Taxonomy',
+ 'object' => 'wptests_tax',
+ 'object_id' => intval( $term_id ),
+ 'url' => get_term_link( intval( $term_id ), '' ),
+ );
+
+ $results = $menus->search_available_items_query(
+ array(
+ 'pagenum' => 1,
+ 's' => 'foo',
+ )
+ );
+
+ $this->assertEqualSets( $expected, $results[0] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Count for number of times customize_nav_menu_searched_items filtered.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunittestsmenuwpAjaxMenuQuickSearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php 2020-05-02 21:44:48 UTC (rev 47746)
+++ trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php 2020-05-02 22:34:50 UTC (rev 47747)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,4 +120,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $results = explode( "\n", trim( $output ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $results );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Test that search displays terms that are not assigned to any posts.
+ *
+ * @ticket 45298
+ */
+ public function test_search_should_return_unassigned_term_items() {
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $this->factory->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'name' => 'foobar',
+ )
+ );
+
+ $request = array(
+ 'type' => 'quick-search-taxonomy-wptests_tax',
+ 'q' => 'foobar',
+ );
+ $output = get_echo( '_wp_ajax_menu_quick_search', array( $request ) );
+
+ $this->assertNotEmpty( $output );
+ $results = explode( "\n", trim( $output ) );
+ $this->assertCount( 1, $results );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>