<!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>[36622] trunk: Customize: Prevent dropping backslashes from input on general settings and settings for nav menus and some widgets.</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/36622">36622</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/36622","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-23 01:01:43 +0000 (Tue, 23 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: Prevent dropping backslashes from input on general settings and settings for nav menus and some widgets.
Ensures that intentional backslashes (e.g. "\o/") can be used in:
* Site title
* Site description
* Nav menu name
* Custom Menu widget title
* Tag Cloud widget title
* Text widget body if can't `unfiltered_html`
The latter three are also fixed on the widgets admin page.
Fixes <a href="https://core.trac.wordpress.org/ticket/35898">#35898</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcustomizesettingphp">trunk/src/wp-includes/class-wp-customize-setting.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp">trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettagcloudphp">trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusettingphp">trunk/tests/phpunit/tests/customize/nav-menu-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesettingphp">trunk/tests/phpunit/tests/customize/setting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcustomizesettingphp"></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-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-setting.php 2016-02-23 00:04:36 UTC (rev 36621)
+++ trunk/src/wp-includes/class-wp-customize-setting.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|array|null Null if an input isn't valid, otherwise the sanitized value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function sanitize( $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = wp_unslash( $value );
</del><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"> * Filter a Customize setting value in un-slashed form.
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp"></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-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-setting.php 2016-02-23 00:04:36 UTC (rev 36621)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,14 +513,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_data['menu-name'] = $value['name'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = $is_placeholder ? 0 : $this->term_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_update_nav_menu_object( $menu_id, $menu_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_name = $menu_data['menu-name'];
</span><span class="cx" style="display: block; padding: 0 10px"> $name_conflict_suffix = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> while ( is_wp_error( $r ) && 'menu_exists' === $r->get_error_code() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $name_conflict_suffix += 1;
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: original menu name, 2: duplicate count */
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_data['menu-name'] = sprintf( __( '%1$s (%2$d)' ), $original_name, $name_conflict_suffix );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = wp_update_nav_menu_object( $menu_id, $menu_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_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-23 00:04:36 UTC (rev 36621)
+++ trunk/src/wp-includes/nav-menu.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,12 +196,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Creates a navigation menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note that <code>$menu_name</code> is expected to be pre-slashed.
+ *
</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 string $menu_name Menu name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error Menu ID on success, WP_Error object on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_create_nav_menu( $menu_name ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // expected_slashed ($menu_name)
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_update_nav_menu_object( 0, array( 'menu-name' => $menu_name ) );
</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">@@ -252,6 +255,8 @@
</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 or create a new menu with those properties.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note that <code>$menu_data</code> is expected to be pre-slashed.
+ *
</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 or "0" to create a new menu.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,6 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error Menu ID on success, WP_Error object on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // expected_slashed ($menu_data)
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_id = (int) $menu_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_menu = wp_get_nav_menu_object( $menu_id );
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp"></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/widgets/class-wp-nav-menu-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php 2016-02-23 00:04:36 UTC (rev 36621)
+++ trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function update( $new_instance, $old_instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $new_instance['title'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance['title'] = sanitize_text_field( stripslashes( $new_instance['title'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance['title'] = sanitize_text_field( $new_instance['title'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $new_instance['nav_menu'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['nav_menu'] = (int) $new_instance['nav_menu'];
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettagcloudphp"></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/widgets/class-wp-widget-tag-cloud.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php 2016-02-23 00:04:36 UTC (rev 36621)
+++ trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function update( $new_instance, $old_instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance['title'] = sanitize_text_field( stripslashes( $new_instance['title'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance['title'] = sanitize_text_field( $new_instance['title'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettextphp"></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/widgets/class-wp-widget-text.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-text.php 2016-02-23 00:04:36 UTC (rev 36621)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,10 +80,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function update( $new_instance, $old_instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = $old_instance;
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['title'] = sanitize_text_field( $new_instance['title'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can('unfiltered_html') )
- $instance['text'] = $new_instance['text'];
- else
- $instance['text'] = wp_kses_post( stripslashes( $new_instance['text'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'unfiltered_html' ) ) {
+ $instance['text'] = $new_instance['text'];
+ } else {
+ $instance['text'] = wp_kses_post( $new_instance['text'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance['filter'] = ! empty( $new_instance['filter'] );
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusettingphp"></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-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-setting.php 2016-02-23 00:04:36 UTC (rev 36621)
+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,8 +114,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_construct_placeholder() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $default = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Lorem',
- 'description' => 'ipsum',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Lorem \\o/',
+ 'description' => 'ipsum \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 123,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'nav_menu[-5]', compact( 'default' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,14 +131,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_value() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_name = 'Test 123';
- $parent_menu_id = wp_create_nav_menu( "Parent $menu_name" );
- $description = 'Hello my world.';
- $menu_id = wp_update_nav_menu_object( 0, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_name = 'Test 123 \\o/';
+ $parent_menu_id = wp_create_nav_menu( wp_slash( "Parent $menu_name" ) );
+ $description = 'Hello my world \\o/.';
+ $menu_id = wp_update_nav_menu_object( 0, wp_slash( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-name' => $menu_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent_menu_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $description,
</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"> $setting_id = "nav_menu[$menu_id]";
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $parent_menu_id, $value['parent'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $new_menu_name = 'Foo';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_nav_menu_object( $menu_id, array( 'menu-name' => $new_menu_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_nav_menu_object( $menu_id, wp_slash( array( 'menu-name' => $new_menu_name ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $updated_value = $setting->value();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $new_menu_name, $updated_value['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,11 +166,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_preview_updated() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id = wp_update_nav_menu_object( 0, array(
- 'menu-name' => 'Name 1',
- 'description' => 'Description 1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id = wp_update_nav_menu_object( 0, wp_slash( array(
+ 'menu-name' => 'Name 1 \\o/',
+ 'description' => 'Description 1 \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</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"> $setting_id = "nav_menu[$menu_id]";
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,16 +178,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Name 2',
- 'description' => 'Description 2',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Name 2 \\o/',
+ 'description' => 'Description 2 \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auto_add' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value( $setting_id, $post_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $setting->value();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'Name 1', $value['name'] );
- $this->assertEquals( 'Description 1', $value['description'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'Name 1 \\o/', $value['name'] );
+ $this->assertEquals( 'Description 1 \\o/', $value['description'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $value['parent'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = (array) wp_get_nav_menu_object( $menu_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,8 +199,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $setting->preview();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $setting->value();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'Name 2', $value['name'] );
- $this->assertEquals( 'Description 2', $value['description'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'Name 2 \\o/', $value['name'] );
+ $this->assertEquals( 'Description 2 \\o/', $value['description'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $value['parent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = (array) wp_get_nav_menu_object( $menu_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $value, wp_array_slice_assoc( $term, array_keys( $value ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $i = array_search( $menu_id, $menus_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $i, 'Update-previewed menu does not appear in wp_get_nav_menus()' );
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_menu = $menus[ $i ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'Name 2', $filtered_menu->name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'Name 2 \\o/', $filtered_menu->name );
</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">@@ -230,8 +230,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = -123;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'New Menu Name 1',
- 'description' => 'New Menu Description 1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'New Menu Name 1 \\o/',
+ 'description' => 'New Menu Description 1 \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auto_add' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $i = array_search( $menu_id, $menus_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'int', $i, 'Insert-previewed menu was not injected into wp_get_nav_menus()' );
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_menu = $menus[ $i ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'New Menu Name 1', $filtered_menu->name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'New Menu Name 1 \\o/', $filtered_menu->name );
</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">@@ -273,11 +273,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_preview_deleted() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id = wp_update_nav_menu_object( 0, array(
- 'menu-name' => 'Name 1',
- 'description' => 'Description 1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id = wp_update_nav_menu_object( 0, wp_slash( array(
+ 'menu-name' => 'Name 1 \\o/',
+ 'description' => 'Description 1 \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</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"> $setting_id = "nav_menu[$menu_id]";
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_options = $this->get_nav_menu_items_option();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,15 +312,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $setting->sanitize( 123 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => ' Hello <b>world</b> ',
- 'description' => "New\nline",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => ' Hello \\o/ <b>world</b> ',
+ 'description' => "New\nline \\o/",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => -12,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auto_add' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'extra' => 'ignored',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $sanitized = $setting->sanitize( $value );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'Hello <b>world</b>', $sanitized['name'] );
- $this->assertEquals( 'New line', $sanitized['description'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'Hello \\o/ <b>world</b>', $sanitized['name'] );
+ $this->assertEquals( 'New line \\o/', $sanitized['description'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $sanitized['parent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( true, $sanitized['auto_add'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( 'name', 'description', 'parent', 'auto_add' ), array_keys( $sanitized ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,11 +338,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_save_updated() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_id = wp_update_nav_menu_object( 0, array(
- 'menu-name' => 'Name 1',
- 'description' => 'Description 1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_id = wp_update_nav_menu_object( 0, wp_slash( array(
+ 'menu-name' => 'Name 1 \\o/',
+ 'description' => 'Description 1 \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</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"> $nav_menu_options = $this->get_nav_menu_items_option();
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_options['auto_add'][] = $menu_id;
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'nav_menu_options', $nav_menu_options );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,8 +352,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $auto_add = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_value = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Name 2',
- 'description' => 'Description 2',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Name 2 \\o/',
+ 'description' => 'Description 2 \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auto_add' => $auto_add,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,8 +400,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = -123;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'New Menu Name 1',
- 'description' => 'New Menu Description 1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'New Menu Name 1 \\o/',
+ 'description' => 'New Menu Description 1 \\o/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auto_add' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_name = 'Foo';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_nav_menu_object( 0, array( 'menu-name' => $menu_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_nav_menu_object( 0, wp_slash( array( 'menu-name' => $menu_name ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = -123;
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_id = "nav_menu[$menu_id]";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,8 +472,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_save_deleted() {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_name = 'Lorem Ipsum';
- $menu_id = wp_create_nav_menu( $menu_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_name = 'Lorem Ipsum \\o/';
+ $menu_id = wp_create_nav_menu( wp_slash( $menu_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting_id = "nav_menu[$menu_id]";
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_options = $this->get_nav_menu_items_option();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,5 +506,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_options = $this->get_nav_menu_items_option();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesettingphp"></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/setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/setting.php 2016-02-23 00:04:36 UTC (rev 36621)
+++ trunk/tests/phpunit/tests/customize/setting.php 2016-02-23 01:01:43 UTC (rev 36622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,14 +67,14 @@
</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"> public $post_data_overrides = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'unset_option_overridden' => 'unset_option_post_override_value',
- 'unset_theme_mod_overridden' => 'unset_theme_mod_post_override_value',
- 'set_option_overridden' => 'set_option_post_override_value',
- 'set_theme_mod_overridden' => 'set_theme_mod_post_override_value',
- 'unset_option_multi_overridden[foo]' => 'unset_option_multi_overridden[foo]_post_override_value',
- 'unset_theme_mod_multi_overridden[foo]' => 'unset_theme_mod_multi_overridden[foo]_post_override_value',
- 'set_option_multi_overridden[foo]' => 'set_option_multi_overridden[foo]_post_override_value',
- 'set_theme_mod_multi_overridden[foo]' => 'set_theme_mod_multi_overridden[foo]_post_override_value',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'unset_option_overridden' => 'unset_option_post_override_value\\o/',
+ 'unset_theme_mod_overridden' => 'unset_theme_mod_post_override_value\\o/',
+ 'set_option_overridden' => 'set_option_post_override_value\\o/',
+ 'set_theme_mod_overridden' => 'set_theme_mod_post_override_value\\o/',
+ 'unset_option_multi_overridden[foo]' => 'unset_option_multi_overridden[foo]_post_override_value\\o/',
+ 'unset_theme_mod_multi_overridden[foo]' => 'unset_theme_mod_multi_overridden[foo]_post_override_value\\o/',
+ 'set_option_multi_overridden[foo]' => 'set_option_multi_overridden[foo]_post_override_value\\o/',
+ 'set_theme_mod_multi_overridden[foo]' => 'set_theme_mod_multi_overridden[foo]_post_override_value\\o/',
</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"> public $standard_type_configs = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,8 +299,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_preview_custom_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'custom_type';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data_overrides = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "unset_{$type}_with_post_value" => "unset_{$type}_without_post_value",
- "set_{$type}_with_post_value" => "set_{$type}_without_post_value",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "unset_{$type}_with_post_value" => "unset_{$type}_without_post_value\\o/",
+ "set_{$type}_with_post_value" => "set_{$type}_without_post_value\\o/",
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['customized'] = wp_slash( wp_json_encode( $post_data_overrides ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 0 === did_action( 'customize_save_foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try setting post value without user as admin.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->manager->set_post_value( $setting->id, 'hello world' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager->set_post_value( $setting->id, 'hello world \\o/' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $setting->save() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 0 === did_action( 'customize_update_custom' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 0 === did_action( 'customize_save_foo' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Setting $setting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function handle_customize_update_custom_foo_action( $value, $setting = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'hello world', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'hello world \\o/', $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Setting', $setting );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>