Changeset 14620 for trunk/wp-includes/nav-menu.php

Timestamp:

05/14/2010 06:20:30 AM (14 years ago)

Author:

nacin

Message:

First pass on 'Theme Locations' for navigation menus. Themes need to specify a location when calling wp_nav_menu and register locations in functions.php. Users then map menus to locations in the nav menu admin. Subject to review. see #13378.

File:

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

trunk/wp-includes/nav-menu.php

@@ -67 +67 @@
  * @since 3.0.0
  *
- * @param array Associative array of menu slot identifiers and descriptions.
- */
-function register_nav_menus( $menus = array() ) {
+ * @param array $locations Associative array of menu location identifiers (like a slug) and descriptive text.
+ */
+function register_nav_menus( $locations = array() ) {
     global $_wp_registered_nav_menus;
 
     add_theme_support( 'nav-menus' );
 
-    $_wp_registered_nav_menus = $menus;
+    $_wp_registered_nav_menus = array_merge( (array) $_wp_registered_nav_menus, $locations );
+}
+
+/**
+ * Register nav menu for a theme.
+ *
+ * @since 3.0.0
+ *
+ * @param string $location Menu location identifier, like a slug.
+ * @param string $description Menu location descriptive text.
+ */
+function register_nav_menu( $location, $description ) {
+    register_nav_menus( array( $location => $description ) );
 }
 
 function get_registered_nav_menus() {
-    global $_wp_registered_nav_menus;
-
-    return $_wp_registered_nav_menus;
-}
-
-function get_nav_menu_slots() {
-    return get_theme_mod('nav_menu_slots');
+    return $GLOBALS['_wp_registered_nav_menus'];
+}
+
+function get_nav_menu_locations() {
+    return get_theme_mod('nav_menu_locations');
 }