Ticket #23508: 23508.3.diff
File 23508.3.diff, 1013 bytes (added by , 12 years ago) |
---|
-
wp-admin/nav-menus.php
264 264 // Get existing menu locations assignments 265 265 $locations = get_registered_nav_menus(); 266 266 $menu_locations = get_nav_menu_locations(); 267 if ( empty( $menu_locations ) || ! is_array( $menu_locations ) )268 $menu_locations = array();269 267 270 268 // Remove menu locations that have been unchecked 271 269 foreach ( $locations as $location => $description ) { -
wp-includes/nav-menu.php
127 127 */ 128 128 129 129 function get_nav_menu_locations() { 130 return get_theme_mod( 'nav_menu_locations' ); 130 $locations = get_theme_mod( 'nav_menu_locations' ); 131 return ( ! empty( $locations ) && is_array( $locations ) ) ? $locations : array(); 131 132 } 132 133 133 134 /**