Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Customizer: Avoid PHP notices after [32806]. 

props adamsilverstein, westonruter.
fixes #32781.
Built from https://develop.svn.wordpress.org/trunk@33035


git-svn-id: http://core.svn.wordpress.org/trunk@33006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-07-01 19:08:24 +00:00
parent 04793dce34
commit 52db28396c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -753,17 +753,17 @@ final class WP_Customize_Nav_Menus {
$args['instance_number'] = $this->preview_nav_menu_instance_number;
$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'] = '';
}
ksort( $args );

2
wp-includes/nav-menu-template.php
View File

@ -308,7 +308,7 @@ function wp_nav_menu( $args = array() ) {
* - Otherwise, bail.
*/
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 );
if ( ! $menu || is_wp_error( $menu ) )

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-33034';
$wp_version = '4.3-alpha-33035';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.