<!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>[39366] branches/4.7: Customize: Fix logic for previewing the URL for `nav_menu_item` settings for terms and post type archives.</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/39366">39366</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/39366","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-27 03:19:32 +0000 (Sun, 27 Nov 2016)</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'>Customize: Fix logic for previewing the URL for `nav_menu_item` settings for terms and post type archives.
Fixes typo in args passed to `get_term_link()` which caused a fatal error due to this call returning a `WP_Error` which was set to `url`. Also fixes never-satisfiable condition for obtaining post type archive URL. Also ensures that `WP_Error` never leaks through as `url` by setting it to an empty string. Adds missing unit tests.
Amends <a href="https://core.trac.wordpress.org/changeset/38991">[38991]</a>.
See <a href="https://core.trac.wordpress.org/ticket/38114">#38114</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/38945">#38945</a> for 4.7.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">branches/4.7/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#branches47testsphpunittestscustomizenavmenuitemsettingphp">branches/4.7/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.7 2016-11-27 03:04:35 UTC (rev 39365)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2016-11-27 03:19:32 UTC (rev 39366)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2016-11-27 03:04:35 UTC (rev 39365)
+++ branches/4.7/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2016-11-27 03:19:32 UTC (rev 39366)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,15 +604,16 @@
</span><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"> // Ensure nav menu item URL is set according to linked object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $post->object_id ) ) {
- if ( 'post_type' === $post->type ) {
- $post->url = get_permalink( $post->object_id );
- } elseif ( 'post_type_archive' === $post->type && ! empty( $post->object ) ) {
- $post->url = get_post_type_archive_link( $post->object );
- } elseif ( 'taxonomy' == $post->type && ! empty( $post->object ) ) {
- $post->url = get_term_link( (int) $post->object, $post->object );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_type' === $post->type && ! empty( $post->object_id ) ) {
+ $post->url = get_permalink( $post->object_id );
+ } elseif ( 'taxonomy' === $post->type && ! empty( $post->object ) && ! empty( $post->object_id ) ) {
+ $post->url = get_term_link( (int) $post->object_id, $post->object );
+ } elseif ( 'post_type_archive' === $post->type && ! empty( $post->object ) ) {
+ $post->url = get_post_type_archive_link( $post->object );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $post->url ) ) {
+ $post->url = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/nav-menu.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $post->attr_title = apply_filters( 'nav_menu_attr_title', $post->attr_title );
</span></span></pre></div>
<a id="branches47testsphpunittestscustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/customize/nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/customize/nav-menu-item-setting.php 2016-11-27 03:04:35 UTC (rev 39365)
+++ branches/4.7/tests/phpunit/tests/customize/nav-menu-item-setting.php 2016-11-27 03:19:32 UTC (rev 39366)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,6 +834,67 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item() to set url for posts, terms, and post type archives.
+ *
+ * @ticket 38945
+ * @covers WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item()
+ */
+ function test_value_as_wp_post_nav_menu_item_term_urls() {
+ $term_id = self::factory()->term->create( array( 'taxonomy' => 'category' ) );
+ register_post_type( 'press_release', array(
+ 'has_archive' => true,
+ ) );
+ $post_id = self::factory()->post->create( array( 'post_type' => 'press_release' ) );
+
+ // Term.
+ $setting = new WP_Customize_Nav_Menu_Item_Setting(
+ $this->wp_customize,
+ 'nav_menu_item[-1]'
+ );
+ $this->wp_customize->set_post_value( $setting->id, array(
+ 'type' => 'taxonomy',
+ 'object' => 'category',
+ 'object_id' => $term_id,
+ 'title' => 'Category',
+ 'url' => '',
+ ) );
+ $setting->preview();
+ $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();
+ $this->assertEquals( get_term_link( $term_id ), $nav_menu_item->url );
+
+ // Post.
+ $setting = new WP_Customize_Nav_Menu_Item_Setting(
+ $this->wp_customize,
+ 'nav_menu_item[-2]'
+ );
+ $this->wp_customize->set_post_value( $setting->id, array(
+ 'type' => 'post_type',
+ 'object' => 'press_release',
+ 'object_id' => $post_id,
+ 'title' => 'PR',
+ 'url' => '',
+ ) );
+ $setting->preview();
+ $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();
+ $this->assertEquals( get_permalink( $post_id ), $nav_menu_item->url );
+
+ // Post type archive.
+ $setting = new WP_Customize_Nav_Menu_Item_Setting(
+ $this->wp_customize,
+ 'nav_menu_item[-3]'
+ );
+ $this->wp_customize->set_post_value( $setting->id, array(
+ 'type' => 'post_type_archive',
+ 'object' => 'press_release',
+ 'title' => 'PR',
+ 'url' => '',
+ ) );
+ $setting->preview();
+ $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();
+ $this->assertEquals( get_post_type_archive_link( 'press_release' ), $nav_menu_item->url );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item() where title is empty.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38015
</span></span></pre>
</div>
</div>
</body>
</html>