Changeset 23550

Timestamp:

03/01/2013 03:51:16 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Ensure that get_nav_menu_locations() always returns an array. props JustinSainton for initial patch. fixes #23508.

Location:

trunk

Files:

• wp-admin/nav-menus.php (modified) (1 diff)
• wp-includes/nav-menu.php (modified) (1 diff)

trunk/wp-admin/nav-menus.php

@@ -265 +265 @@
         $locations = get_registered_nav_menus();
         $menu_locations = get_nav_menu_locations();
-        if ( empty( $menu_locations ) || ! is_array( $menu_locations ) )
-            $menu_locations = array();
 
         // Remove menu locations that have been unchecked

trunk/wp-includes/nav-menu.php

@@ -128 +128 @@
 
 function get_nav_menu_locations() {
-    return get_theme_mod( 'nav_menu_locations' );
+    $locations = get_theme_mod( 'nav_menu_locations' );
+    return ( is_array( $locations ) ) ? $locations : array();
 }