<!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>[33089] trunk: Customizer: Ensure that a newly-added nav menu item gets the Original link populated in its control.</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/33089">33089</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/33089","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>2015-07-06 05:52:59 +0000 (Mon, 06 Jul 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'>Customizer: Ensure that a newly-added nav menu item gets the Original link populated in its control.
Props valendesigns.
Fixes <a href="https://core.trac.wordpress.org/ticket/32858">#32858</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-07-05 18:19:44 UTC (rev 33088)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2015-07-06 05:52:59 UTC (rev 33089)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $post->post_type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => (int) $post->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => intval( $post->ID ),
+ 'url' => get_permalink( intval( $post->ID ) ),
</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"> } elseif ( 'taxonomy' === $obj_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $term->taxonomy,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => $term->term_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => intval( $term->term_id ),
+ 'url' => get_term_link( intval( $term->term_id ), $term->taxonomy ),
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,11 +230,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $results[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'post-' . $post->ID,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $post->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => intval( $post->ID ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => get_permalink( intval( $post->ID ) ),
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,11 +253,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $results[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'term-' . $term->term_id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $term->taxonomy,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => intval( $term->term_id ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => get_term_link( intval( $term->term_id ), $term->taxonomy ),
</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"> }
</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 2015-07-05 18:19:44 UTC (rev 33088)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2015-07-06 05:52:59 UTC (rev 33089)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,11 +97,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'post-' . $post_id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => html_entity_decode( get_the_title( $post_id ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_post_type_object( 'post' )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => intval( $post_id ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => html_entity_decode( get_the_title( $post_id ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => get_permalink( intval( $post_id ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post_id, $term_ids, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $search = $post_id === $post_ids[0] ? 'test & search' : 'other title';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,11 +116,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'id', $term_id, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'term-' . $term_id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => $term->name,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_taxonomy( 'category' )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => intval( $term_id ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => $term->name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => get_term_link( intval( $term_id ), 'category' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $s = sanitize_text_field( wp_unslash( $term->name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $menus->search_available_items_query( array( 'pagenum' => 1, 's' => $s ) );
</span></span></pre>
</div>
</div>
</body>
</html>