Changeset 33035

Timestamp:

07/01/2015 07:07:20 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Customizer: Avoid PHP notices after [32806].

props adamsilverstein, westonruter.
fixes #32781.

Location:

trunk/src/wp-includes

Files:

• class-wp-customize-nav-menus.php (modified) (1 diff)
• nav-menu-template.php (modified) (1 diff)

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

@@ -754 +754 @@
 
         $can_partial_refresh = (
-            $args['echo']
+            ! empty( $args['echo'] )
             &&
-            is_string( $args['fallback_cb'] )
+            ( empty( $args['fallback_cb'] ) || is_string( $args['fallback_cb'] ) )
             &&
-            is_string( $args['walker'] )
+            ( empty( $args['walker'] ) || is_string( $args['walker'] ) )
         );
         $args['can_partial_refresh'] = $can_partial_refresh;
 
         if ( ! $can_partial_refresh ) {
-            unset( $args['fallback_cb'] );
-            unset( $args['walker'] );
+            $args['fallback_cb'] = '';
+            $args['walker'] = '';
         }
 

trunk/src/wp-includes/nav-menu-template.php

@@ -309 +309 @@
      */
     if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
-        && $args->fallback_cb && is_callable( $args->fallback_cb ) )
+        && isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) )
             return call_user_func( $args->fallback_cb, (array) $args );