sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Customizer: Prevent loss of `walker` and `fallback_cb` args for `wp_nav_menu`. 

These args only need to be cleared out when exported to JavaScript, when they are not JSON-serializable. So the filter now clears these when gathering args for exporting to JS, but otherwise now leaves the original values to be passed through to `wp_nav_menu()`.

Fixes #32781.


git-svn-id: https://develop.svn.wordpress.org/trunk@33131 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter 2015-07-08 20:17:52 +00:00
parent f5043ab022
commit 3c0e4d3860
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/class-wp-customize-nav-menus.php
View File

@ -771,15 +771,17 @@ final class WP_Customize_Nav_Menus {
); );
$args['can_partial_refresh'] = $can_partial_refresh; $args['can_partial_refresh'] = $can_partial_refresh;
$hashed_args = $args;
if ( ! $can_partial_refresh ) { if ( ! $can_partial_refresh ) {
$args['fallback_cb'] = ''; $hashed_args['fallback_cb'] = '';
$args['walker'] = ''; $hashed_args['walker'] = '';
} }
ksort( $args ); ksort( $hashed_args );
$args['args_hash'] = $this->hash_nav_menu_args( $args ); $hashed_args['args_hash'] = $this->hash_nav_menu_args( $hashed_args );
$this->preview_nav_menu_instance_args[ $this->preview_nav_menu_instance_number ] = $args; $this->preview_nav_menu_instance_args[ $this->preview_nav_menu_instance_number ] = $hashed_args;
return $args; return $args;
} }

10
tests/phpunit/tests/customize/nav-menus.php
View File

@ -358,7 +358,6 @@ class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase {
$expected = array( $expected = array(
'echo', 'echo',
'args_hash',
'can_partial_refresh', 'can_partial_refresh',
'fallback_cb', 'fallback_cb',
'instance_number', 'instance_number',
@ -370,9 +369,14 @@ class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase {
'walker' => new Walker_Nav_Menu(), 'walker' => new Walker_Nav_Menu(),
) ); ) );
$this->assertEqualSets( $expected, array_keys( $results ) ); $this->assertEqualSets( $expected, array_keys( $results ) );
$this->assertEquals( '', $results['fallback_cb'] ); $this->assertEquals( 'wp_page_menu', $results['fallback_cb'] );
$this->assertEquals( '', $results['walker'] );
$this->assertEquals( 0, $results['can_partial_refresh'] ); $this->assertEquals( 0, $results['can_partial_refresh'] );
$this->assertNotEmpty( $menus->preview_nav_menu_instance_args[ $results['instance_number'] ] );
$preview_nav_menu_instance_args = $menus->preview_nav_menu_instance_args[ $results['instance_number'] ];
$this->assertEquals( '', $preview_nav_menu_instance_args['fallback_cb'] );
$this->assertEquals( '', $preview_nav_menu_instance_args['walker'] );
$this->assertNotEmpty( $preview_nav_menu_instance_args['args_hash'] );
} }
/** /**