Changeset 41204

Timestamp:

08/02/2017 05:10:05 AM (8 years ago)

Author:

westonruter

Message:

Customize: For selective refresh of nav menus, prevent preg_replace() from dropping backslashes in JSON replaced into the data-customize-partial-placement-context HTML attribute.

Props dlh, westonruter.
Fixes #41488.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-nav-menus.php (modified) (2 diffs)
• tests/phpunit/tests/customize/nav-menus.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -1266 +1266 @@
      * @param string $nav_menu_content The HTML content for the navigation menu.
      * @param object $args             An object containing wp_nav_menu() arguments.
-     * @return null
+     * @return string Nav menu HTML with selective refresh attributes added if partial can be refreshed.
      */
     public function filter_wp_nav_menu( $nav_menu_content, $args ) {
@@ -1273 +1273 @@
             $attributes .= ' data-customize-partial-type="nav_menu_instance"';
             $attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $args->customize_preview_nav_menus_args ) ) );
-            $nav_menu_content = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $nav_menu_content, 1 );
+            $nav_menu_content = preg_replace( '#^(<\w+)#', '$1 ' . str_replace( '\\', '\\\\', $attributes ), $nav_menu_content, 1 );
         }
         return $nav_menu_content;

trunk/tests/phpunit/tests/customize/nav-menus.php

@@ -862 +862 @@
      * Test the filter_wp_nav_menu method.
      *
-     * @see WP_Customize_Nav_Menus::filter_wp_nav_menu()
+     * @covers WP_Customize_Nav_Menus::filter_wp_nav_menu()
+     * @covers WP_Customize_Nav_Menus::filter_wp_nav_menu_args()
      */
     function test_filter_wp_nav_menu() {
@@ -868 +869 @@
         $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
 
-        $args = $menus->filter_wp_nav_menu_args( array(
+        $original_args = array(
             'echo'        => true,
             'menu'        => wp_create_nav_menu( 'Foo' ),
@@ -874 +875 @@
             'walker'      => '',
             'items_wrap'  => '<ul id="%1$s" class="%2$s">%3$s</ul>',
-        ) );
+        );
+
+        // Add global namespace prefix to check #41488.
+        if ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {
+            $original_args['fallback_cb'] = '\\' . $original_args['fallback_cb'];
+        }
+
+        $args = $menus->filter_wp_nav_menu_args( $original_args );
 
         ob_start();
@@ -884 +892 @@
         $this->assertContains( sprintf( ' data-customize-partial-id="nav_menu_instance[%s]"', $args['customize_preview_nav_menus_args']['args_hmac'] ), $result );
         $this->assertContains( ' data-customize-partial-type="nav_menu_instance"', $result );
-        $this->assertContains( ' data-customize-partial-placement-context="', $result );
+        $this->assertTrue( (bool) preg_match( '/data-customize-partial-placement-context="(.+?)"/', $result, $matches ) );
+        $context = json_decode( html_entity_decode( $matches[1] ), true );
+        $this->assertEquals( $original_args, wp_array_slice_assoc( $context, array_keys( $original_args ) ) ); // Because assertArraySubset is not available in PHP 5.2.
+        $this->assertTrue( $context['can_partial_refresh'] );
     }