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

Timestamp:

05/03/2010 08:26:11 PM (16 years ago)

Author:

ryan

Message:

Strip trailing whites.

File:

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

trunk/wp-admin/nav-menus.php

@@ -108 +108 @@
                                 $dbids_to_objectids[$ordered_menu_item_object->ID] = $possible_object_id;
                                 $objectids_to_dbids[$possible_object_id] = $ordered_menu_item_object->ID;
-                            } 
+                            }
                         }
                     }
@@ -115 +115 @@
                     // if this menu item is not first
                     if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
-                        
+
                         // if this menu item is a child of the previous
-                        if ( 
-                            ! empty( $menu_item_data['post_parent'] ) && 
+                        if (
+                            ! empty( $menu_item_data['post_parent'] ) &&
                             isset( $objectids_to_dbids[$menu_item_data['post_parent']] ) &&
                             isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) &&
@@ -128 +128 @@
 
                             if ( ! is_wp_error( $parent_data ) ) {
-                                
+
                                 // if there is something before the parent, make menu item a child of the parent's parent
                                 if ( ! empty( $dbids_to_orders[$parent_db_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) ) {
@@ -137 +137 @@
                                     $menu_item_data['post_parent'] = 0;
                                 }
-                                
+
                                 // set former parent's [menu_order] to that of menu-item's
                                 $parent_data['menu_order'] = $parent_data['menu_order'] + 1;
@@ -143 +143 @@
                                 // set menu-item's [menu_order] to that of former parent
                                 $menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
-                                
+
                                 // save changes
                                 wp_update_post($menu_item_data);
@@ -169 +169 @@
         if ( is_nav_menu_item( $menu_item_id ) ) {
             if ( wp_delete_post( $menu_item_id, true ) ) {
-                
+
                 $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
             }
@@ -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 ) ) 
+                        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] ) )
@@ -328 +328 @@
     <?php screen_icon(); ?>
     <h2><?php esc_html_e('Menus'); ?></h2>
-    <?php 
+    <?php
     foreach( $messages as $message ) :
-        echo $message . "\n"; 
+        echo $message . "\n";
     endforeach;
     ?>
-    
+
     <?php if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) : ?>
     <div id="nav-menus-frame">
@@ -365 +365 @@
             <div class="nav-tabs-wrapper">
             <div class="nav-tabs">
-                <?php 
+                <?php
                 foreach( (array) $nav_menus as $_nav_menu ) :
-            
-                    ?><a href="<?php 
+
+                    ?><a href="<?php
                         echo add_query_arg(
                             array(
@@ -376 +376 @@
                             admin_url( 'nav-menus.php' )
                         );
-                    ?>" class="nav-tab<?php 
-                        if ( $nav_menu_selected_id == $_nav_menu->term_id ) 
+                    ?>" class="nav-tab<?php
+                        if ( $nav_menu_selected_id == $_nav_menu->term_id )
                             echo ' nav-tab-active';
                         else
@@ -383 +383 @@
                     ?>"><?php echo esc_html( $_nav_menu->name ); ?></a><?php
                 endforeach;
-                ?><a href="<?php 
+                ?><a href="<?php
                     echo add_query_arg(
                         array(
@@ -391 +391 @@
                         admin_url( 'nav-menus.php' )
                     );
-                ?>" class="nav-tab menu-add-new<?php 
-                    if ( 0 == $nav_menu_selected_id ) 
+                ?>" class="nav-tab menu-add-new<?php
+                    if ( 0 == $nav_menu_selected_id )
                         echo ' nav-tab-active';
                 ?>"><?php printf( '<abbr title="%s">+</abbr>', esc_html__( 'Add menu' ) ); ?></a>
@@ -407 +407 @@
                                     <br class="clear" />
                                 </label>
-                            
+
                                 <div class="publishing-action">
                                     <input class="button-primary" name="save_menu" type="submit" value="<?php empty($nav_menu_selected_id) ? esc_attr_e('Create Menu') : esc_attr_e('Save Menu'); ?>" />
                                 </div><!--END .publishing-action-->
-                            
+
                                 <?php if ( ! empty( $nav_menu_selected_id ) ) : ?>
                                 <div class="delete-action">
@@ -430 +430 @@
                             <?php if ( is_nav_menu( $nav_menu_selected_id ) && ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) ) : ?>
                                 <ul class="menu" id="menu-to-edit">
-                                <?php 
-                                $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id  ); 
+                                <?php
+                                $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id  );
                                 if ( ! is_wp_error( $edit_markup ) ) {
                                     echo $edit_markup;