Changeset 15189

Timestamp:

06/10/2010 03:28:39 PM (15 years ago)

Author:

nacin

Message:

Server-side check for an empty menu name on save. props ocean90, fixes #13703.

File:

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

trunk/wp-admin/nav-menus.php

@@ -283 +283 @@
         // Add Menu
         if ( 0 == $nav_menu_selected_id ) {
-            $new_menu_title = esc_html( $_POST['menu-name'] );
+            $new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
 
             if ( $new_menu_title ) {
@@ -308 +308 @@
             $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
 
+            $menu_title = trim( esc_html( $_POST['menu-name'] ) );
+            if ( ! $menu_title ) {
+                $messages[] = '<div id="message" class="error"><p>' . __('Please enter a valid menu name.') . '</p></div>';
+                $menu_title = $_menu_object->name;
+            }
+
             if ( ! is_wp_error( $_menu_object ) ) {
-                $_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $_POST['menu-name'] ) );
+                $_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
                 if ( is_wp_error( $_nav_menu_selected_id ) ) {
                     $_menu_object = $_nav_menu_selected_id;