Changeset 33131

Timestamp:

07/08/2015 08:17:52 PM (11 years ago)

Author:

westonruter

Message:

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.

Location:

trunk

Files:

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

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

@@ -772 +772 @@
                 $args['can_partial_refresh'] = $can_partial_refresh;
 
+                $hashed_args = $args;
+
                 if ( ! $can_partial_refresh ) {
-                        $args['fallback_cb'] = '';
-                        $args['walker'] = '';
-                }
-
-                ksort( $args );
-                $args['args_hash'] = $this->hash_nav_menu_args( $args );
-
-                $this->preview_nav_menu_instance_args[ $this->preview_nav_menu_instance_number ] = $args;
+                        $hashed_args['fallback_cb'] = '';
+                        $hashed_args['walker'] = '';
+                }
+
+                ksort( $hashed_args );
+                $hashed_args['args_hash'] = $this->hash_nav_menu_args( $hashed_args );
+
+                $this->preview_nav_menu_instance_args[ $this->preview_nav_menu_instance_number ] = $hashed_args;
                 return $args;
         }

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

@@ -359 +359 @@
                 $expected = array(
                         'echo',
-                        'args_hash',
                         'can_partial_refresh',
                         'fallback_cb',
@@ -371 +370 @@
                 ) );
                 $this->assertEqualSets( $expected, array_keys( $results ) );
-                $this->assertEquals( '', $results['fallback_cb'] );
-                $this->assertEquals( '', $results['walker'] );
+                $this->assertEquals( 'wp_page_menu', $results['fallback_cb'] );
                 $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'] );
         }