From a1a8216fa9aa0a0cff93a020798087b2ccda5bf8 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Tue, 1 Aug 2017 21:01:56 -0700 Subject: [PATCH 1/3] Fix handling of backslashes encoded in in partial placement context data --- src/wp-includes/class-wp-customize-nav-menus.php | 4 ++-- tests/phpunit/tests/customize/nav-menus.php | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/class-wp-customize-nav-menus.php b/src/wp-includes/class-wp-customize-nav-menus.php index fdf45e52297f3..9b24fa0b67b2f 100644 --- a/src/wp-includes/class-wp-customize-nav-menus.php +++ b/src/wp-includes/class-wp-customize-nav-menus.php @@ -1265,14 +1265,14 @@ public function filter_wp_nav_menu_args( $args ) { * * @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 ) { if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) { $attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) ); $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; } diff --git a/tests/phpunit/tests/customize/nav-menus.php b/tests/phpunit/tests/customize/nav-menus.php index 77116305e2b77..393a15e52e90e 100644 --- a/tests/phpunit/tests/customize/nav-menus.php +++ b/tests/phpunit/tests/customize/nav-menus.php @@ -861,19 +861,21 @@ function test_filter_wp_nav_menu_args() { /** * 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() { do_action( 'customize_register', $this->wp_customize ); $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' ), - 'fallback_cb' => 'wp_page_menu', + 'fallback_cb' => '\wp_page_menu', // Global namespace used to check #41488. 'walker' => '', 'items_wrap' => '', - ) ); + ); + $args = $menus->filter_wp_nav_menu_args( $original_args ); ob_start(); wp_nav_menu( $args ); @@ -883,7 +885,10 @@ function test_filter_wp_nav_menu() { $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->assertArraySubset( $original_args, $context ); + $this->assertTrue( $context['can_partial_refresh'] ); } /** From b0577fc1b14a5166eeabfdb66389e4ec4b3948d7 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Tue, 1 Aug 2017 21:21:30 -0700 Subject: [PATCH 2/3] Fix test compat with 5.2 --- tests/phpunit/tests/customize/nav-menus.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/tests/customize/nav-menus.php b/tests/phpunit/tests/customize/nav-menus.php index 393a15e52e90e..2b6e654924713 100644 --- a/tests/phpunit/tests/customize/nav-menus.php +++ b/tests/phpunit/tests/customize/nav-menus.php @@ -871,10 +871,16 @@ function test_filter_wp_nav_menu() { $original_args = array( 'echo' => true, 'menu' => wp_create_nav_menu( 'Foo' ), - 'fallback_cb' => '\wp_page_menu', // Global namespace used to check #41488. + 'fallback_cb' => 'wp_page_menu', 'walker' => '', 'items_wrap' => '', ); + + // 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(); From 845d2a122aa0cdcf23c282dfd767ccb40163fffb Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Tue, 1 Aug 2017 21:39:39 -0700 Subject: [PATCH 3/3] Fix phpunit compat for PHP 5.2 --- tests/phpunit/tests/customize/nav-menus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/tests/customize/nav-menus.php b/tests/phpunit/tests/customize/nav-menus.php index 2b6e654924713..393790af43ef9 100644 --- a/tests/phpunit/tests/customize/nav-menus.php +++ b/tests/phpunit/tests/customize/nav-menus.php @@ -893,7 +893,7 @@ function test_filter_wp_nav_menu() { $this->assertContains( ' data-customize-partial-type="nav_menu_instance"', $result ); $this->assertTrue( (bool) preg_match( '/data-customize-partial-placement-context="(.+?)"/', $result, $matches ) ); $context = json_decode( html_entity_decode( $matches[1] ), true ); - $this->assertArraySubset( $original_args, $context ); + $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'] ); }