<!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>[36608] trunk: Customize: Fix previewing and updating of nav menu items containing slashed/slashable characters.</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/36608">36608</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/36608","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-02-22 00:13:53 +0000 (Mon, 22 Feb 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 previewing and updating of nav menu items containing slashed/slashable characters.
Prevents slashes from being added when a user without `unfiltered_html` previews a nav menu item containing an apostrophe or some other slashable character, and prevents the loss of an intentional slash (e.g. "\o/") when saving a nav menu item, regardless of capability.
Fixes <a href="https://core.trac.wordpress.org/ticket/35869">#35869</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenuitemsettingphp">trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></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/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">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2016-02-21 21:44:14 UTC (rev 36607)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2016-02-22 00:13:53 UTC (rev 36608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,9 +639,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_value['original_title'] = sanitize_text_field( $menu_item_value['original_title'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Apply the same filters as when calling wp_insert_post().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_item_value['title'] = apply_filters( 'title_save_pre', $menu_item_value['title'] );
- $menu_item_value['attr_title'] = apply_filters( 'excerpt_save_pre', $menu_item_value['attr_title'] );
- $menu_item_value['description'] = apply_filters( 'content_save_pre', $menu_item_value['description'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_item_value['title'] = wp_unslash( apply_filters( 'title_save_pre', wp_slash( $menu_item_value['title'] ) ) );
+ $menu_item_value['attr_title'] = wp_unslash( apply_filters( 'excerpt_save_pre', wp_slash( $menu_item_value['attr_title'] ) ) );
+ $menu_item_value['description'] = wp_unslash( apply_filters( 'content_save_pre', wp_slash( $menu_item_value['description'] ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' !== $menu_item_value['status'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,7 +776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_update_nav_menu_item(
</span><span class="cx" style="display: block; padding: 0 10px"> $value['nav_menu_term_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> $is_placeholder ? 0 : $this->post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_item_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_slash( $menu_item_data )
</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 ( is_wp_error( $r ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2016-02-21 21:44:14 UTC (rev 36607)
+++ trunk/src/wp-includes/nav-menu.php 2016-02-22 00:13:53 UTC (rev 36608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,6 +344,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Save the properties of a menu item or create a new one.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The menu-item-title, menu-item-description, and menu-item-attr-title are expected
+ * to be pre-slashed since they are passed directly into <code>wp_insert_post()</code>.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $menu_id The ID of the menu. Required. If "0", makes the menu item a draft orphan.
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenuitemsettingphp"></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-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2016-02-21 21:44:14 UTC (rev 36607)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2016-02-22 00:13:53 UTC (rev 36608)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,11 +450,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_item_parent' => 'asdasd',
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => -123,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'custom<b>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => 'Hi<script>unfilteredHtml()</script>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => '\o/ o\'o Hi<script>unfilteredHtml()</script>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'javascript:alert(1)',
</span><span class="cx" style="display: block; padding: 0 10px"> 'target' => '" onclick="',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'attr_title' => '<b>bolded</b><script>unfilteredHtml()</script>',
- 'description' => '<b>Hello world</b><script>unfilteredHtml()</script>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'attr_title' => '\o/ o\'o <b>bolded</b><script>unfilteredHtml()</script>',
+ 'description' => '\o/ o\'o <b>Hello world</b><script>unfilteredHtml()</script>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'classes' => 'hello " inject="',
</span><span class="cx" style="display: block; padding: 0 10px"> 'xfn' => 'hello " inject="',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'forbidden',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,11 +469,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_item_parent' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => -123,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'customb',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => current_user_can( 'unfiltered_html' ) ? 'Hi<script>unfilteredHtml()</script>' : 'HiunfilteredHtml()',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => current_user_can( 'unfiltered_html' ) ? '\o/ o\'o Hi<script>unfilteredHtml()</script>' : '\o/ o\'o HiunfilteredHtml()',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'target' => 'onclick',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'attr_title' => current_user_can( 'unfiltered_html' ) ? '<b>bolded</b><script>unfilteredHtml()</script>' : '<b>bolded</b>unfilteredHtml()',
- 'description' => current_user_can( 'unfiltered_html' ) ? '<b>Hello world</b><script>unfilteredHtml()</script>' : '<b>Hello world</b>unfilteredHtml()',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'attr_title' => current_user_can( 'unfiltered_html' ) ? '\o/ o\'o <b>bolded</b><script>unfilteredHtml()</script>' : '\o/ o\'o <b>bolded</b>unfilteredHtml()',
+ 'description' => current_user_can( 'unfiltered_html' ) ? '\o/ o\'o <b>Hello world</b><script>unfilteredHtml()</script>' : '\o/ o\'o <b>Hello world</b>unfilteredHtml()',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'classes' => 'hello inject',
</span><span class="cx" style="display: block; padding: 0 10px"> 'xfn' => 'hello inject',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'draft',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $value, $sanitized[ $key ], "Expected $key to be sanitized." );
</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">- $nav_menu_item_id = wp_update_nav_menu_item( $menu_id, 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nav_menu_item_id = wp_update_nav_menu_item( $menu_id, 0, wp_slash( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object-id' => $unsanitized['object_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-object' => $unsanitized['object'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-parent-id' => $unsanitized['menu_item_parent'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-classes' => $unsanitized['classes'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-xfn' => $unsanitized['xfn'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-status' => $unsanitized['status'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $nav_menu_item_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_item = wp_setup_nav_menu_item( clone $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +549,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => $second_post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => 'Saludos',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => 'Saludos \o/ o\'o',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_term_id' => $secondary_menu_id,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>