Changeset 14831 for trunk/wp-admin/nav-menus.php

Timestamp:

05/24/2010 09:23:56 AM (16 years ago)

Author:

nacin

Message:

Menu tweaks. Save menu locations when saving the menu. Also, centralize theme support checks and add them to menu.php. Improve some branching. Remove some old JS vars, add a missing semicolon, etc. props koopersmith. see #13378.

File:

• trunk/wp-admin/nav-menus.php (modified) (5 diffs)

trunk/wp-admin/nav-menus.php

@@ -15 +15 @@
 // Load all the nav menu interface functions
 require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
+
+if ( ! current_theme_supports( 'nav-menus' ) && ! current_theme_supports( 'widgets' ) )
+        wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
 
 // Permissions Check
@@ -271 +274 @@
                 check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
 
+                // Update menu theme locations
+                set_theme_mod( 'nav_menu_locations', $_POST['menu-locations'] );
+
                 // Add Menu
                 if ( 0 == $nav_menu_selected_id ) {
-                        if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) {
-                                $new_menu_title = esc_html( $_POST['menu-name'] );
-
-                                if ( $new_menu_title ) {
-                                        $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
-
-                                        if ( is_wp_error( $_nav_menu_selected_id ) ) {
-                                                $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
-                                        } else {
-                                                if ( ( $_menu_locations = get_registered_nav_menus() ) && 1 == count( wp_get_nav_menus() ) )
-                                                        set_theme_mod( 'nav_menu_locations', array( key( $_menu_locations ) => $_nav_menu_selected_id ) );
-                                                unset( $_menu_locations );
-                                                $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
-                                                $nav_menu_selected_id = $_nav_menu_selected_id;
-                                                $nav_menu_selected_title = $_menu_object->name;
-                                                $messages[] = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been successfully created.'), $nav_menu_selected_title ) . '</p></div>';
-                                        }
+                        $new_menu_title = esc_html( $_POST['menu-name'] );
+
+                        if ( $new_menu_title ) {
+                                $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
+
+                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
+                                        $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
                                 } else {
-                                        $messages[] = '<div id="message" class="error"><p>' . __('Please enter a valid menu name.') . '</p></div>';
-                                }
+                                        if ( ( $_menu_locations = get_registered_nav_menus() ) && 1 == count( wp_get_nav_menus() ) )
+                                                set_theme_mod( 'nav_menu_locations', array( key( $_menu_locations ) => $_nav_menu_selected_id ) );
+                                        unset( $_menu_locations );
+                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+                                        $nav_menu_selected_id = $_nav_menu_selected_id;
+                                        $nav_menu_selected_title = $_menu_object->name;
+                                        $messages[] = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been successfully created.'), $nav_menu_selected_title ) . '</p></div>';
+                                }
+                        } else {
+                                $messages[] = '<div id="message" class="error"><p>' . __('Please enter a valid menu name.') . '</p></div>';
                         }
 
@@ -426 +430 @@
         endforeach;
         ?>
-
-        <?php if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) : ?>
         <div id="nav-menus-frame">
         <div id="menu-settings-column" class="metabox-holder">
@@ -518 +520 @@
                                         <div id="post-body">
                                                 <div id="post-body-content">
-                                                        <?php if ( is_nav_menu( $nav_menu_selected_id ) && ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) ) : ?>
+                                                        <?php if ( is_nav_menu( $nav_menu_selected_id ) ) : ?>
                                                                 <ul class="menu" id="menu-to-edit">
                                                                 <?php
@@ -543 +545 @@
         </div><!-- /#menu-management-liquid -->
         </div><!-- /#nav-menus-frame-->
-        <?php endif; // if menus supported in current theme ?>
 </div><!-- /.wrap-->