Changeset 13830 for trunk/wp-includes/nav-menu-template.php

Timestamp:

03/26/2010 07:36:49 PM (15 years ago)

Author:

nacin

Message:

Remove trailing whites and double semicolons.

File:

• trunk/wp-includes/nav-menu-template.php (modified) (10 diffs)

trunk/wp-includes/nav-menu-template.php

@@ -51 +51 @@
     if ( 'div' == $args->container ) {
         $class = $args->container_class ? ' class="' . esc_attr($args->container_class) . '"' : '';
-        
+
         if ( is_nav_menu($menu) ) {
             $nav_menu .= '<div id="menu-' . $menu->slug . '"'. $class .'>';
@@ -63 +63 @@
     if ( 'div' == $args->container )
         $nav_menu .= '</div>';
-    
+
     $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
 
@@ -85 +85 @@
     $defaults = array( 'menu' => '', 'menu_class' => 'menu', 'context' => 'frontend', 'depth' => 0,
     'fallback_cb' => '', 'walker' => '', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', );
-    
+
     $args = wp_parse_args( $args, $defaults );
     $args = apply_filters( 'wp_get_nav_menu_args', $args );
     $args = (object) $args;
-    
+
     // Variable setup
     $nav_menu = '';
     $items = '';
-    
+
     // Get the menu object
     $menu = wp_get_nav_menu_object( $args->menu );
-    
+
     // If the menu exists, get it's items.
     if ( $menu && !is_wp_error($menu) )
         $menu_items = wp_get_nav_menu_items( $menu->term_id, $args->context );
-    
+
     // If no menu was found or if the menu has no items, call the fallback_cb
     if ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) ) {
@@ -108 +108 @@
         }
     }
-        
+
     // Set up the $menu_item variables
     foreach ( (array) $menu_items as $key => $menu_item )
         $menu_items[$menu_item->menu_order] = wp_setup_nav_menu_item( $menu_item, 'frontend' );
-    
+
     $items .= walk_nav_menu_tree( $menu_items, $args->depth, $args );
-    
+
     // CSS class
     $ul_class = $args->menu_class ? ' class="'. $args->menu_class .'"' : '';
     $nav_menu .= '<ul'. $ul_class .'>';
-    
+
     // Allow plugins to hook into the menu to add their own <li>'s
     if ( 'frontend' == $args->context ) {
@@ -127 +127 @@
         $nav_menu .= $items;
     }
-    
+
     $nav_menu .= '</ul>';
-    
+
     return apply_filters( 'wp_get_nav_menu', $nav_menu );
 }
@@ -151 +151 @@
             $attributes .= ( isset($menu_item->xfn) && '' != $menu_item->xfn ) ? ' rel="'. esc_attr($menu_item->xfn) .'"' : '';
             $attributes .= ( isset($menu_item->url) && '' != $menu_item->url ) ? ' href="'. esc_attr($menu_item->url) .'"' : '';
-            
+
             $output .= esc_html( $args->before );
             $output .= '<a'. $attributes .'>';
@@ -157 +157 @@
             $output .= '</a>';
             $output .= esc_html( $args->after );
-            
+
             break;
-        
+
         case 'backend':
             $output .= '<dl><dt>';
@@ -165 +165 @@
             $output .= '<span class="item-controls">';
             $output .= '<span class="item-type">'. esc_html( $menu_item->append ) .'</span>';
-            
+
             // Actions
             $output .= '<a class="item-edit thickbox" id="edit-'. esc_attr( $menu_item->ID ) .'" value="'. esc_attr( $menu_item->ID ) .'" title="'. __('Edit Menu Item') .'" href="#TB_inline?height=540&width=300&inlineId=menu-item-settings">'. __('Edit') .'</a> | ';
             $output .= '<a class="item-delete" id="delete-'. esc_attr( $menu_item->ID ) .'" value="'. esc_attr( $menu_item->ID ) .'">'. __('Delete') .'</a>';
-            
+
             $output .= '</span></dt></dl>';
-            
+
             // Menu Item Settings
             $output .= '<input type="hidden" name="menu-item-db-id[]" value="'. esc_attr( $menu_item->ID ) .'" />';
@@ -187 +187 @@
             $output .= '<input type="hidden" name="menu-item-target[]" value="'. esc_attr( $menu_item->target ) .'" />';
             break;
-        
+
         case 'custom':
         case 'taxonomy':
         case 'post_type':
             $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( 'menu-item-' . $menu_item->object_id ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
-            
+
             // Menu item hidden fields
             $output .= '<input type="hidden" class="menu-item-db-id" value="0" />';
@@ -210 +210 @@
             break;
     }
-    
+
     return $output;
 }