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

Timestamp:

04/29/2010 07:33:56 AM (14 years ago)

Author:

nacin

Message:

When posts/terms are deleted/trashed, update associated menu items. Deleted post = deleted menu item, trashed post = menu item becomes a draft. props filosofo, see #13174

File:

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

trunk/wp-admin/nav-menus.php

@@ -39 +39 @@
 
 // Container for any messages displayed to the user
-$messages_div = '';
+$messages = array();
 
 // Container that stores the name of the active menu
@@ -170 +170 @@
             if ( wp_delete_post( $menu_item_id, true ) ) {
                 
-                $messages_div = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+                $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
             }
         }
@@ -181 +181 @@
 
             if ( is_wp_error($delete_nav_menu) ) {
-                $messages_div = '<div id="message" class="error"><p>' . $delete_nav_menu->get_error_message() . '</p></div>';
+                $messages[] = '<div id="message" class="error"><p>' . $delete_nav_menu->get_error_message() . '</p></div>';
             } else {
-                $messages_div = '<div id="message" class="updated"><p>' . __('The menu has been successfully deleted.') . '</p></div>';
+                $messages[] = '<div id="message" class="updated"><p>' . __('The menu has been successfully deleted.') . '</p></div>';
                 $nav_menu_selected_id = 0; // Reset the selected menu
             }
@@ -202 +202 @@
 
                     if ( is_wp_error( $_nav_menu_selected_id ) ) {
-                        $messages_div = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+                        $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
                     } else {
                         $_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 = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been successfully created.'), $nav_menu_selected_title ) . '</p></div>';
+                        $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 = '<div id="message" class="error"><p>' . __('Please enter a valid menu name.') . '</p></div>';
+                    $messages[] = '<div id="message" class="error"><p>' . __('Please enter a valid menu name.') . '</p></div>';
                 }
             }
@@ -223 +223 @@
                 if ( is_wp_error( $_nav_menu_selected_id ) ) {
                     $_menu_object = $_nav_menu_selected_id;
-                    $messages_div = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+                    $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
                 } else {
                     $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
@@ -249 +249 @@
                         $menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
 
-                        if ( ! is_wp_error( $menu_item_db_id ) && isset( $menu_items[$menu_item_db_id] ) ) {
+                        if ( is_wp_error( $menu_item_db_id ) ) 
+                            $messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
+                        elseif ( isset( $menu_items[$menu_item_db_id] ) )
                             unset( $menu_items[$menu_item_db_id] );
-                        }
                     }
                 }
@@ -266 +267 @@
                 do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
 
-                $messages_div = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been updated.'), $nav_menu_selected_title ) . '</p></div>';
+                $messages[] = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been updated.'), $nav_menu_selected_title ) . '</p></div>';
                 unset( $menu_items );
             }
@@ -311 +312 @@
     // Set up nav menu
     wp_nav_menu_setup();
-    $messages_div = '<div id="message" class="error"><p>' . __('The current theme does not natively support menus, but you can use the &#8220;Navigation Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p></div>';
+    $messages[] = '<div id="message" class="error"><p>' . __('The current theme does not natively support menus, but you can use the &#8220;Navigation Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p></div>';
 
 // The theme supports neither menus nor widgets.
 } else {
     remove_meta_box( 'create-menu', 'nav-menus', 'side' );
-    $messages_div = '<div id="message" class="error"><p>' . __('The current theme does not support menus.') . '</p></div>';
+    $messages[] = '<div id="message" class="error"><p>' . __('The current theme does not support menus.') . '</p></div>';
 }
 
@@ -325 +326 @@
     <?php screen_icon(); ?>
     <h2><?php esc_html_e('Menus'); ?></h2>
-    <?php echo $messages_div; ?>
+    <?php 
+    foreach( $messages as $message ) :
+        echo $message . "\n"; 
+    endforeach;
+    ?>
     
     <?php if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) : ?>