Changeset 13733

Timestamp:

03/17/2010 04:27:25 PM (17 years ago)

Author:

ryan

Message:

Trim trailing whitespace

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/css/install.dev.css (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/export.php (modified) (1 diff)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/export.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-admin/includes/nav-menu.php (modified) (15 diffs)
• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (3 diffs)
• wp-admin/includes/template.php (modified) (9 diffs)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-admin/js/common.dev.js (modified) (2 diffs)
• wp-admin/js/inline-edit-post.dev.js (modified) (1 diff)
• wp-admin/js/nav-menu.dev.js (modified) (23 diffs)
• wp-admin/menu.php (modified) (2 diffs)
• wp-admin/ms-edit.php (modified) (2 diffs)
• wp-admin/ms-sites.php (modified) (8 diffs)
• wp-admin/ms-users.php (modified) (1 diff)
• wp-admin/nav-menus.php (modified) (11 diffs)
• wp-admin/network.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (2 diffs)
• wp-admin/tools.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (1 diff)
• wp-admin/update.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (3 diffs)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/nav-menu-template.php (modified) (16 diffs)
• wp-includes/nav-menu.php (modified) (10 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post.php (modified) (5 diffs)
• wp-includes/query.php (modified) (2 diffs)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (2 diffs)
• wp-signup.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -36 +36 @@
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 var userSettings = {
-                'url': '<?php echo SITECOOKIEPATH; ?>', 
+                'url': '<?php echo SITECOOKIEPATH; ?>',
                 'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
                 'time':'<?php echo time() ?>'
         },
-        ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', 
-        pagenow = '<?php echo $current_screen->id; ?>', 
-        typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>', 
-        adminpage = '<?php echo $admin_body_class; ?>',  
-        thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>', 
+        ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
+        pagenow = '<?php echo $current_screen->id; ?>',
+        typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+        adminpage = '<?php echo $admin_body_class; ?>',
+        thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
         decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>';
 //]]>

trunk/wp-admin/css/install.dev.css

@@ -54 +54 @@
         border-bottom: none;
         text-align:center
-} 
+}
 
 .step {

trunk/wp-admin/edit-tags.php

@@ -306 +306 @@
 <?php elseif ( 'post_tag' == $taxonomy ) : ?>
 <div class="form-wrap">
-<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'admin.php?import=wp-cat2tag&amp;step=3') ;?>.</p> 
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'admin.php?import=wp-cat2tag&amp;step=3') ;?>.</p>
 </div>
 <?php endif;

trunk/wp-admin/export.php

@@ -50 +50 @@
 $months = "";
 for ( $i = 1; $i < 13; $i++ ) {
-        $months .= "\t\t\t<option value=\"" . zeroise($i, 2) . '">' . 
+        $months .= "\t\t\t<option value=\"" . zeroise($i, 2) . '">' .
                 $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) . "</option>\n";
 } ?>

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1087 +1087 @@
                 if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
                         $this->error = $this->upgrader->strings[$error];
-                
+
                 if ( is_wp_error($error) && $error->get_error_code() ) {
                         foreach ( $error->get_error_messages() as $emessage ) {

trunk/wp-admin/includes/export.php

@@ -39 +39 @@
 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 
-if ( $post_type and $post_type != 'all' ) { 
-                $where = $wpdb->prepare("WHERE post_type = %s ", $post_type); 
-} else { 
-                $where = "WHERE post_type != 'revision' "; 
-} 
-if ( $author and $author != 'all' ) { 
-                $author_id = (int) $author; 
-                $where .= $wpdb->prepare("AND post_author = %d ", $author_id); 
-} 
-if ( $start_date and $start_date != 'all' ) { 
-                $where .= $wpdb->prepare("AND post_date >= %s ", $start_date); 
-} 
-if ( $end_date and $end_date != 'all' ) { 
-                $where .= $wpdb->prepare("AND post_date < %s ", $end_date); 
-} 
-if ( $category and $category != 'all' ) { 
-                $taxomony_id = (int) $category; 
-                $where .= $wpdb->prepare("AND ID IN (SELECT object_id FROM {$wpdb->term_relationships} " . "WHERE term_taxonomy_id = %d) ", $taxomony_id); 
-} 
-if ( $status and $status != 'all' ) { 
-                $where .= $wpdb->prepare("AND post_status = %s ", $status); 
-} 
+if ( $post_type and $post_type != 'all' ) {
+                $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
+} else {
+                $where = "WHERE post_type != 'revision' ";
+}
+if ( $author and $author != 'all' ) {
+                $author_id = (int) $author;
+                $where .= $wpdb->prepare("AND post_author = %d ", $author_id);
+}
+if ( $start_date and $start_date != 'all' ) {
+                $where .= $wpdb->prepare("AND post_date >= %s ", $start_date);
+}
+if ( $end_date and $end_date != 'all' ) {
+                $where .= $wpdb->prepare("AND post_date < %s ", $end_date);
+}
+if ( $category and $category != 'all' ) {
+                $taxomony_id = (int) $category;
+                $where .= $wpdb->prepare("AND ID IN (SELECT object_id FROM {$wpdb->term_relationships} " . "WHERE term_taxonomy_id = %d) ", $taxomony_id);
+}
+if ( $status and $status != 'all' ) {
+                $where .= $wpdb->prepare("AND post_status = %s ", $status);
+}
 
 // grab a snapshot of post IDs, just in case it changes during the export

trunk/wp-admin/includes/file.php

@@ -314 +314 @@
         // A writable uploads dir will pass this test. Again, there's no point overriding this one.
         if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) )
-                return call_user_func($upload_error_handler, $file, $uploads['error'] ); 
+                return call_user_func($upload_error_handler, $file, $uploads['error'] );
 
         $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );

trunk/wp-admin/includes/misc.php

@@ -657 +657 @@
 /**
  * Send a HTTP header to disable content type sniffing in browsers which support it.
- * 
+ *
  * @link http://blogs.msdn.com/ie/archive/2008/07/02/ie8-security-part-v-comprehensive-protection.aspx
  * @link http://src.chromium.org/viewvc/chrome?view=rev&revision=6985
- * 
+ *
  * @since 3.0.0.
  * @return none
  */
 function send_nosniff_header() {
-        @header( 'X-Content-Type-Options: nosniff' ); 
+        @header( 'X-Content-Type-Options: nosniff' );
 }
 /**

trunk/wp-admin/includes/ms.php

@@ -169 +169 @@
         if ( !is_array( $users ) )
                 return false;
-        
+
     screen_icon('tools');
     ?>
@@ -184 +184 @@
                 if ( $val != '' && $val != '0' ) {
                         $delete_user = new WP_User( $val );
-            
+
                         if ( in_array( $delete_user->user_login, $site_admins ) )
                                 wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user->user_login ) );
-                
+
                         echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
                         $blogs = get_blogs_of_user( $val, true );
-            
+
                         if ( !empty( $blogs ) ) {
                                 echo '<p><strong>' . sprintf( __( 'Sites from %s:' ), $delete_user->user_login ) . '</strong></p>';

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

@@ -14 +14 @@
 function wp_nav_menu_post_type_metaboxes() {
         $post_types = get_post_types( array( 'public' => true ), 'object' );
-        
+
         if ( !$post_types )
                 return false;
@@ -100 +100 @@
 function wp_nav_menu_item_link_metabox() {
         $args = array( 'post_status' => 'any', 'post_type' => 'nav_menu_item', 'meta_value' => 'custom', 'showposts' => -1 );
-        
+
         // @todo transient caching of these results with proper invalidation on updating links
         $query = new WP_Query( $args );
-        
+
         ?>
         <p id="menu-item-url-wrap">
@@ -118 +118 @@
                 </label>
         </p>
-        
+
         <p class="button-controls">
                 <a class="show-all"><?php _e('View All'); ?></a>
@@ -147 +147 @@
 function wp_nav_menu_item_post_type_metabox( $object, $post_type ) {
         $args = array( 'post_type' => $post_type['args']->name, 'post_status' => 'publish', 'showposts' => -1 );
-        
+
         if ( 'attachment' == $post_type['args']->name )
                 $args['post_status'] = 'any';
-        
+
         // @todo transient caching of these results with proper invalidation on updating of a post of this type
         $query = new WP_Query( $args );
-        
+
         if ( !$query->posts )
                 $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'</li>';
-        
+
         $pt_names = '';
         if ( is_array($query->posts) ) {
@@ -167 +167 @@
                 }
         }
-        
+
         $id = $post_type['args']->name;
         ?>
@@ -174 +174 @@
                 <a class="quick-search-submit button-secondary"><?php _e('Search'); ?></a>
         </p>
-        
+
         <p class="button-controls">
                 <a class="show-all"><?php _e('View All'); ?></a>
                 <a class="hide-all"><?php _e('Hide All'); ?></a>
         </p>
-        
+
         <div id="existing-<?php echo esc_attr( $id ); ?>" class="list-wrap">
                 <div class="list-container">
@@ -219 +219 @@
         // @todo transient caching of these results with proper invalidation on updating of a tax of this type
         $terms = get_terms( $taxonomy['args']->name, $args );
-        
+
         if ( !$terms )
                 $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'</li>';
-        
+
         $term_names = '';
         if ( is_array($terms) ) {
@@ -233 +233 @@
                 }
         }
-        
+
         $id = $taxonomy['args']->name;
         ?>
@@ -240 +240 @@
                 <a class="quick-search-submit button-secondary"><?php _e('Search'); ?></a>
         </p>
-        
+
         <p class="button-controls">
                 <a class="show-all"><?php _e('View All'); ?></a>
                 <a class="hide-all"><?php _e('Hide All'); ?></a>
         </p>
-        
+
         <div id="existing-<?php echo esc_attr( $id ); ?>" class="list-wrap">
                 <div class="list-container">
@@ -282 +282 @@
         if ( !$menu_items )
                 return __( 'Not Found' );
-                
+
         $output = '';
         $i = 1;
@@ -290 +290 @@
                 if ( !isset($menu_item->post_parent) )
                         $menu_item->post_parent = $menu_item->parent;
-                
+
                 // Cleanest way to get all attachements
                 if ( 'attachment' == $object )
                         $menu_item->post_parent = 0;
-                
+
                 if ( 0 == $menu_item->post_parent ) {
                         // Set up the menu item
-                        $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );                       
+                        $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
                         $attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
-                        
+
                         $output .= '<li'. $attributes .'>';
                         $output .= wp_get_nav_menu_item( $menu_item, $object_type, $object );
@@ -308 +308 @@
                 }
         }
-        
+
         return $output;
 }
@@ -324 +324 @@
 function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $context = 'frontend' ) {
         $args = array( 'child_of' => $childof, 'parent' => $childof, 'hide_empty' => false, );
-        
+
         switch ( $object_type ) {
                 case 'post_type':
@@ -335 +335 @@
                         }
                         break;
-                        
+
                 case 'taxonomy':
                         if ( is_taxonomy_hierarchical( $object ) ) {
@@ -343 +343 @@
                         }
                         break;
-                
+
                 default:
                         $sub_menu_items = array();
                         break;
         }
-        
+
         $output = '';
         $i = 1;

trunk/wp-admin/includes/plugin.php

@@ -558 +558 @@
  * @param string|array $plugins
  * @param string $redirect Redirect to page after successful activation.
- * @param bool $network_wide Whether to enable the plugin for all sites in the network. 
+ * @param bool $network_wide Whether to enable the plugin for all sites in the network.
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */

trunk/wp-admin/includes/post.php

@@ -271 +271 @@
                         unset($post_data['post_category']);
         }
-        
+
         $tax_input = array();
         if ( isset($post_data['tax_input'])) {
@@ -279 +279 @@
                         $taxonomy = get_taxonomy( $tax_name );
                         if ( $taxonomy->hierarchical )
-                                $tax_input[$tax_name] = array_map( 'absint', $terms );                  
+                                $tax_input[$tax_name] = array_map( 'absint', $terms );
                         else {
                                 $tax_input[$tax_name] = preg_replace( '/\s*,\s*/', ',', rtrim( trim($terms), ' ,' ) );
@@ -315 +315 @@
                         continue;
                 }
-                
+
                 $tax_names = get_object_taxonomies( get_post($post_ID) );
-                
+
                 if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
                         $cats = (array) wp_get_post_categories($post_ID);
                         $post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
                 }
-                
+
                 foreach ( $tax_names as $tax_name ) {
                         if( isset( $tax_input[$tax_name])  ) {

trunk/wp-admin/includes/template.php

@@ -863 +863 @@
         foreach ( $taxonomy_names as $taxonomy_name ) {
                 $taxonomy = get_taxonomy( $taxonomy_name);
-                
+
                 if( !$taxonomy->show_ui ) continue;
-                
+
                 if( $taxonomy->hierarchical )
                         $hierarchical_taxonomies[] = $taxonomy;
-                else 
+                else
                         $flat_taxonomies[] = $taxonomy;
         }
-        
+
         $columns = wp_manage_posts_columns($screen);
         $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
@@ -966 +966 @@
 
         <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
-        
+
 <?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
 
@@ -2974 +2974 @@
 
  * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
- * @param string $title Formatted title of the section. Shown as the heading for the section. 
+ * @param string $title Formatted title of the section. Shown as the heading for the section.
  * @param string $callback Function that echo's out content for the section heading.
  * @param string $page The slug-name of the settings page on which to show the section (general, reading, writing, ...).
@@ -3000 +3000 @@
  * The $callback argument should be the name of a function that echoes out the
  * html input tags for this setting field. Use get_option() to retrive existing
- * values to show. 
+ * values to show.
  *
  * @since 2.7.0
@@ -3103 +3103 @@
  *
  * @global array $wp_settings_errors Storage array of errors registered during this pageload
- * 
+ *
  * @param string $setting Slug title of the setting to which this error applies
  * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
@@ -3130 +3130 @@
  * pageload and returns them.
  *
- * If changes were just submitted ($_GET['updated']) and settings errors were saved 
+ * If changes were just submitted ($_GET['updated']) and settings errors were saved
  * to the 'settings_errors' transient then those errors will be returned instead. This
  * is used to pass errors back across pageloads.
@@ -3178 +3178 @@
  *
  * Part of the Settings API. Outputs a <div> for each error retrieved by get_settings_errors().
- * 
+ *
  * This is called automatically after a settings page based on the Settings API is submitted.
  * Errors should be added during the validation callback function for a setting defined in register_setting()
@@ -3301 +3301 @@
 function favorite_actions( $screen = null ) {
         global $post_type_object;
-        
+
         $default_action = false;
-        
+
         if ( is_string($screen) )
                 $screen = convert_to_screen($screen);
-                
+
         if ( isset($post_type_object) ) {
                 switch ( $screen->id ) {
@@ -3317 +3317 @@
                 }
         }
-        
+
         if ( !$default_action ) {
                 switch ( $screen->id ) {

trunk/wp-admin/includes/upgrade.php

@@ -266 +266 @@
                                                                 ));
 
-        // Setup default widgets for default theme. 
-        update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) ); 
+        // Setup default widgets for default theme.
+        update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
         update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
         update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
@@ -1110 +1110 @@
         if ( $wp_current_db_version < 12751 ) {
                 populate_roles_300();
-                if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) 
+                if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
                         add_site_option( 'siteurl', '' );
         }

trunk/wp-admin/js/common.dev.js

@@ -290 +290 @@
                         this.scrollTop = scroll;
                 }
-                
+
                 if ( e.stopPropagation )
                         e.stopPropagation();
@@ -296 +296 @@
                         e.preventDefault();
         });
-        
+
         $('#newcontent').blur(function(e) {
                 if ( this.lastKey && 9 == this.lastKey )

trunk/wp-admin/js/inline-edit-post.dev.js

@@ -159 +159 @@
                         }
                 });
-                
+
 
                 // handle the post status

trunk/wp-admin/js/nav-menu.dev.js

@@ -34 +34 @@
         var item_classes = jQuery('#menu-item-classes' + id).val();
         var item_xfn = jQuery('#menu-item-xfn' + id).val();
-        
+
         // Only allow custom links to be editable.
         if ( 'custom' != item_type )
                 jQuery( '#edit-menu-item-url' ).attr('disabled', 'disabled' );
-        
+
         // Populate the fields for thickbox
         jQuery( '#edit-menu-item-id' ).val(id);
@@ -49 +49 @@
         jQuery( '#edit-menu-item-classes' ).val(item_classes);
         jQuery( '#edit-menu-item-xfn' ).val(item_xfn);
-        
+
         // focus
         jQuery( '#edit-menu-item-title' ).focus();
@@ -66 +66 @@
         var item_classes = jQuery('#edit-menu-item-classes').val();
         var item_xfn = jQuery('#edit-menu-item-xfn').val();
-        
+
         // update menu item settings
         jQuery('.menu #menu-item' + id).find('span.item-title').html(item_title);
@@ -76 +76 @@
         jQuery('.menu #menu-item-classes' + id).val(item_classes);
         jQuery('.menu #menu-item-xfn' + id).val(item_xfn);
-        
+
         jQuery('.menu #menu-item' + id + ' dt:first').animate( { backgroundColor: '#FFFF33' }, { duration: 'normal', complete: function() { jQuery(this).css( 'backgroundColor', '' ); }});
 }
@@ -87 +87 @@
 function wp_remove_menu_item( o ) {
         var todelete = document.getElementById('menu-item' + o);
-        
+
         if ( todelete ) {
                 // Give some feedback to the user
@@ -115 +115 @@
         var randomnumber = wp_get_unique_menu_id();
         var hidden = wp_get_hidden_inputs( randomnumber, item_db_id, item_object_id, item_type, item_append, item_parent_id, item_title, item_url, item_description, item_attr_title, item_target, item_classes, item_xfn );
-        
+
         // Adds the item in the queue
         jQuery('.menu').append('<li id="menu-item' + randomnumber + '" value="' + randomnumber + '"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="item-title">' + item_title + '</span><span class="item-controls"><span class="item-type">' + item_append + '</span><a class="item-edit thickbox" id="edit' + randomnumber + '" value="' + randomnumber +'" onClick="wp_edit_menu_item('+ randomnumber +')" title="' + navMenuL10n.thickbox + '" href="#TB_inline?height=540&width=300&inlineId=menu-item-settings">' + navMenuL10n.edit + '</a> | <a class="item-delete" id="delete' + randomnumber + '" value="' + randomnumber +'">Delete</a></span></dt></dl>' + hidden + '</li>');
-        
+
         // Give some feedback to the user
         jQuery( '.menu #menu-item' + randomnumber + ' dt:first' ).animate( { backgroundColor: '#FFFF33' }, { duration: 'normal', complete: function() { jQuery(this).css( 'backgroundColor', '' ); }});
-        
+
         // Enable drag-n-drop
         wp_drag_and_drop();
-        
+
         // Reload thickbox
         tb_init('a.thickbox, area.thickbox, input.thickbox');
@@ -137 +137 @@
         // Grab checked items
         var items = jQuery(button).siblings('.list-wrap').find(':checked');
-        
+
         // If nothing was checked, cancel
         if ( 0 == items.length )
                 return false;
-        
+
         // Loop through each item, grab it's hidden data and add it to the menu.
         jQuery(items).each(function(){
                 var item_type = jQuery(this).parent().siblings('.menu-item-type').val();
-                
+
                 if ( 'custom' == item_type ) {
                         var item_attr_title = jQuery(this).parent().siblings('.menu-item-attr-title').val();
@@ -157 +157 @@
                         var item_xfn = '';
                 };
-                
+
                 var item_db_id = jQuery(this).parent().siblings('.menu-item-db-id').val();
                 var item_object_id = jQuery(this).parent().siblings('.menu-item-object-id').val();
@@ -165 +165 @@
                 var item_url = jQuery(this).parent().siblings('.menu-item-url').val();
                 var item_description = jQuery(this).parent().siblings('.menu-item-description').val();
-                
+
                 if ( undefined == item_description ) {
                         item_description = '';
                 };
-                
+
                 // Add the menu item to the menu
                 wp_add_item_to_menu( item_db_id, item_object_id, item_type, item_append, item_parent_id, item_title, item_url, item_description, item_attr_title, item_target, item_classes, item_xfn );
-                
+
                 // uncheck the menu item in the list
                 jQuery(this).attr( 'checked', false );
@@ -205 +205 @@
                         var li = jQuery(this).parent();
                         var child = !jQuery(this).hasClass('dropzone');
-                        
+
                         // Append UL to first child
                         if ( child && li.children('ul').length == 0 ) {
@@ -221 +221 @@
                         var draggablevalue = ui.draggable.attr('value');
                         var droppablevalue = li.attr('value');
-                        
+
                         li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
                         jQuery(this).parent().find('dt').removeAttr('style');
@@ -255 +255 @@
 function wp_update_post_data() {
         var i = 0;
-        
+
          jQuery('.menu li').each(function(i) {
                 i = i + 1;
@@ -263 +263 @@
         jQuery(this).attr('id','menu-item' + i);
         jQuery(this).attr('value', i);
-                
+
         jQuery(this).find('#menu-item-db-id' + j).attr('id','menu-item-db-id' + i);
         jQuery(this).find('#menu-item-object-id' + j).attr('id','menu-item-object-id' + i);
@@ -279 +279 @@
                 }
                 jQuery(this).find('#menu-item-parent-id' + j).attr('value', p);
-                
+
                 jQuery(this).find('#menu-item-title' + j).attr('id','menu-item-title' + i);
                 jQuery(this).find('#menu-item-url' + j).attr('id','menu-item-url' + i);
@@ -288 +288 @@
                 jQuery(this).find('#menu-item-attr-title' + j).attr('id','menu-item-attr-title' + i);
                 jQuery(this).find('#menu-item-target' + j).attr('id','menu-item-target' + i);
-                
+
                 jQuery('#li-count').attr( 'value', i );
    });
@@ -322 +322 @@
 /**
  * Returns all the nessecary hidden inputs for each menu item.
- * 
+ *
  * @param string item_db_id - The menu item's db id.
  * @param string item_object_id - The menu item's object id.
@@ -338 +338 @@
 function wp_get_hidden_inputs( randomnumber, item_db_id, item_object_id, item_type, item_append, item_parent_id, item_title, item_url, item_description, item_attr_title, item_target, item_classes, item_xfn ) {
         var hidden = '';
-        
+
         hidden += '<input type="hidden" name="menu-item-db-id[]" id="menu-item-db-id' + randomnumber + '" value="' + item_db_id + '" />';
         hidden += '<input type="hidden" name="menu-item-object-id[]" id="menu-item-object-id' + randomnumber + '" value="' + item_object_id + '" />';
@@ -352 +352 @@
         hidden += '<input type="hidden" name="menu-item-classes[]" id="menu-item-classes' + randomnumber + '" value="' + item_classes + '" />';
         hidden += '<input type="hidden" name="menu-item-xfn[]" id="menu-item-xfn' + randomnumber + '" value="' + item_xfn + '" />';
-        
+
         return hidden;
 }
@@ -370 +370 @@
  */
 jQuery(document).ready(function($){
-        
+
         wp_drag_and_drop();
-        
+
         // Delete AYS
         $('#update-nav-menu .deletion').click(function(){
@@ -381 +381 @@
                 };
         });
-        
+
         // Handle Save Button Clicks
         $('#save_menu').click(function(){
                 return wp_update_post_data();
         });
-        
+
         // close postboxes that should be closed
         $('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-        
+
         // postboxes setup
         postboxes.add_postbox_toggles('menus');
-        
+
         // Clear the quick search textbox
         $('.quick-search').click(function(){
                 $(this).attr( 'value', '' );
         });
-        
+
         // Quick Search submit
         $('.quick-search-submit').click(function(){
                 $(this).siblings('.quick-search').search();
         });
-        
+
         // Edit menu item
         $('#menu-container .item-edit').click(function(){
                 return wp_edit_menu_item( $(this).attr('value') );
         });
-        
+
         // Delete menu item
         $('#menu-container .item-delete').live( 'click', function(e){
                 return wp_remove_menu_item( $(this).attr('value') );
         });
-        
+
         // Update menu item settings (thickbox)
         $('#update-menu-item').click(function(){
@@ -418 +418 @@
                 return tb_remove();
         });
-        
+
         // Close thickbox
         $('#cancel-save').click(function(){
                 return tb_remove();
         });
-        
+
         // Show All Button
         $('.show-all').click(function(e){
@@ -431 +431 @@
                 jQuery(e.currentTarget).siblings('.hide-all').show();
         });
-        
+
         // Hide All Button
         $('.hide-all').click(function(e){
@@ -449 +449 @@
                 var link_url = jQuery(e.currentTarget).parent().parent().find('#custom-menu-item-url').val();
                 var link_name = jQuery(e.currentTarget).parent().parent().find('#custom-menu-item-name').val();
-                
+
                 // Add link to menu
                 wp_add_item_to_menu( 0, '', 'custom', navMenuL10n.custom, 0, link_name, link_url, '', '', '_self', '', '' );

trunk/wp-admin/menu.php

@@ -49 +49 @@
         if ( is_multisite() )
                 $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
-        
+
         if ( is_super_admin() ) {
                 $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
@@ -117 +117 @@
         $_wp_last_object_menu++;
         $ptype_obj = get_post_type_object($ptype);
-        
+
         $menu[$_wp_last_object_menu] = array(esc_attr($ptype_obj->label), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-posts', 'menu-' . sanitize_html_class($ptype), 'div');
         $submenu["edit.php?post_type=$ptype"][5]  = array( __('Edit'), 'edit_posts',  "edit.php?post_type=$ptype");

trunk/wp-admin/ms-edit.php

@@ -306 +306 @@
                 if ( $id != '0' && $id != $current_site->blog_id )
                         wpmu_delete_blog( $id, true );
-        
+
                 wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'delete'), $_POST[ 'ref' ] ) );
                 exit();
@@ -343 +343 @@
                                 wp_die( __('You are not allowed to change one of these sites.') );
                                 exit();
-                        }; 
-                }; 
+                        };
+                };
 
                 wp_redirect( add_query_arg( array('updated' => 'true', 'action' => $blogfunction), $_SERVER['HTTP_REFERER'] ) );

trunk/wp-admin/ms-sites.php

@@ -244 +244 @@
                                                 foreach ( (array) $blogusers as $key => $val ) {
                                                         if ( isset( $val->meta_value ) && ! $val->meta_value )
-                                                                continue; 
+                                                                continue;
                                                         $t = @unserialize( $val->meta_value );
                                                         if ( is_array( $t ) ) {
@@ -338 +338 @@
 
                 $s = isset($_GET['s']) ? stripslashes( trim( $_GET[ 's' ] ) ) : '';
-                $like_s = esc_sql( like_escape( $s ) ); 
+                $like_s = esc_sql( like_escape( $s ) );
 
                 $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
@@ -420 +420 @@
                 $status_class = '';
                 $count = get_blog_count();
-                
+
                 if ( empty($_GET['blogstatus']) || $_GET['blogstatus'] == 'all' )
                                 $status_class = ' class="current"';
@@ -475 +475 @@
                 number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
                 number_format_i18n( min( $pagenum * $per_page, $num_pages ) ),
-                number_format_i18n( $num_pages ), 
+                number_format_i18n( $num_pages ),
                 $page_links
                 ); echo $page_links_text; ?>
                 </div>
                 <?php } ?>
-                
+
                 <div class="view-switch">
                         <a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
@@ -488 +488 @@
                 </div>
 
-                <div class="clear"></div> 
+                <div class="clear"></div>
 
                 <?php
@@ -540 +540 @@
                                         if ( $order_by == $column_id )
                                                 $order2 = ($order == 'DESC') ? 'ASC' : 'DESC';
-                                                
+
                                         $column_link .= esc_url(add_query_arg( array('order' => $order2, 'paged' => $pagenum, 'sortby' => $column_id ), remove_query_arg( array('action', 'updated'), $_SERVER['REQUEST_URI'] ) ) );
                                         $column_link .= "'>{$column_display_name}</a>";
@@ -547 +547 @@
                                 <th scope="col">
                                         <?php echo $col_url ?>
-                                </th> 
+                                </th>
                                 <?php } ?>
                                 </tr>
@@ -640 +640 @@
                                                                                 $date = 'Y/m/d \<\b\r \/\> g:i:s a';
                                                                         echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __("Never") : mysql2date( __( $date ), $blog['last_updated'] ); ?>
-                                                                </td> 
+                                                                </td>
                                                         <?php
                                                         break;

trunk/wp-admin/ms-users.php

@@ -196 +196 @@
                                                                 <td class="username column-username">
                                                                         <?php echo $avatar; ?><strong><a href="<?php echo $edit; ?>" class="edit"><?php echo stripslashes($user['user_login']); ?></a><?php
-                                                                if ( in_array( $user[ 'user_login' ], $super_admins ) ) 
+                                                                if ( in_array( $user[ 'user_login' ], $super_admins ) )
                                                                         echo ' - ' . __( 'Super admin' );
 ?></strong>

trunk/wp-admin/nav-menus.php

@@ -63 +63 @@
                 }
                 break;
-        
+
         case 'update':
                 check_admin_referer( 'update-nav_menu' );
-                
+
                 // Add Menu
                 if ( isset($_POST['create-menu']) ) {
@@ -92 +92 @@
                         $new_nav_menu = wp_update_term( $nav_menu_selected_id, 'nav_menu', $args );
                 }
-                
+
                 // Update menu items
                 $update_nav_items = isset( $_POST['li-count'] ) ? (int) $_POST['li-count'] : 0;
                 $update_nav_menu = is_nav_menu( $nav_menu_selected_id );
-                
+
                 if ( !is_wp_error($update_nav_menu) ) {
                         $menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
                         $parent_menu_ids = array();
-                        
+
                         // Loop through all POST variables
                         for ( $k = 0; $k < $update_nav_items; $k++ ) {
@@ -109 +109 @@
                                 $menu_item_type                 = isset( $_POST['menu-item-type'][$k] )                 ? $_POST['menu-item-type'][$k]          : 'custom';
                                 $menu_item_append               = isset( $_POST['menu-item-append'][$k] )               ? $_POST['menu-item-append'][$k]        : 'custom';
-                                
+
                                 $menu_item_title                = isset( $_POST['menu-item-title'][$k] )                ? $_POST['menu-item-title'][$k]         : '';
                                 $menu_item_url                  = isset( $_POST['menu-item-url'][$k] )                  ? $_POST['menu-item-url'][$k]           : '';
@@ -117 +117 @@
                                 $menu_item_classes              = isset( $_POST['menu-item-classes'][$k] )              ? $_POST['menu-item-classes'][$k]       : '';
                                 $menu_item_xfn                  = isset( $_POST['menu-item-xfn'][$k] )                  ? $_POST['menu-item-xfn'][$k]           : '';
-                                
+
                                 // Menu item title can't be blank
                                 if ( '' == $menu_item_title )
                                         continue;
-                                
+
                                 // Populate the menu item
                                 $post = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'post_author' => $user_ID,
@@ -137 +137 @@
                                 }
                                 $parent_menu_ids[$k] = $menu_item_db_id;
-                                
+
                                 // @todo sanitize type append and ID.
                                 update_post_meta( $menu_item_db_id, 'menu_item_type', $menu_item_type );
@@ -146 +146 @@
                                 update_post_meta( $menu_item_db_id, 'menu_item_classes', sanitize_html_class($menu_item_classes) );
                                 update_post_meta( $menu_item_db_id, 'menu_item_xfn', sanitize_html_class($menu_item_xfn) );
-                                
+
                                 // @todo: only save custom link urls.
                                 update_post_meta( $menu_item_db_id, 'menu_item_url', esc_url_raw( $menu_item_url ) );
                         }
-                        
+
                         // Remove menu items from the menu that weren't in $_POST
                         if ( !empty( $menu_items ) ) {
@@ -178 +178 @@
 // Else try to grab the first menu from the menus list
 } elseif ( 0 == $nav_menu_selected_id && ! empty($nav_menus) ) {
-        $nav_menu_selected_id = $nav_menus[0]->term_id; 
+        $nav_menu_selected_id = $nav_menus[0]->term_id;
 }
 
@@ -215 +215 @@
                         foreach ( $nav_menus as $_nav_menu ) {
                                 $sep = end( $nav_menus ) == $_nav_menu ? '' : ' | ';
-                                
+
                                 if ( $nav_menu_selected_id == $_nav_menu->term_id )
                                         echo '<li><a href="'. admin_url( 'nav-menus.php?action=edit&amp;menu=' . esc_attr($_nav_menu->term_id) ) .'" class="current">'. esc_html( $_nav_menu->name ) .'</a>'. $sep .'</li>';
@@ -233 +233 @@
                         <input type="hidden" name="li-count" id="li-count" value="0" />
                         <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
-                        
+
                         <div id="post-body">
                                 <div id="post-body-content">
@@ -240 +240 @@
                                                         <h3 class="hndle"><?php echo esc_html( $nav_menu_selected_title ); ?></h3>
                                                         <div class="inside">
-                                                                
+
                                                                 <?php echo wp_get_nav_menu( array( 'context' => 'backend', 'menu' => $nav_menu_selected_id ) ); ?>
-                                                                
+
                                                         </div><!-- /.inside -->
                                                 <!-- /#nav-menu-canvas .postbox-->
@@ -253 +253 @@
                         </div><!--- /#post-body -->
                         <div id="menu-settings-column" class="inner-sidebar">
-                                
+
                                 <?php do_meta_boxes( 'menus', 'side', null ); ?>
-                                
+
                         </div><!-- /#menu-settings-column -->
                 </form><!--/#update-nav-menu-->

trunk/wp-admin/network.php

@@ -279 +279 @@
         }
 ?></textarea>
-<?php   
+<?php
         }
 ?>

trunk/wp-admin/options.php

@@ -30 +30 @@
 if ( !current_user_can('manage_options') )
         wp_die(__('Cheatin’ uh?'));
-        
+
 if ( is_multisite() && !is_super_admin() && 'update' != $action )
         wp_die(__('Cheatin’ uh?'));

trunk/wp-admin/plugins.php

@@ -97 +97 @@
                         break;
                 case 'update-selected' :
-                
+
                         check_admin_referer( 'bulk-manage-plugins' );
-                        
+
                         if ( isset( $_GET['plugins'] ) )
                                 $plugins = explode( ',', $_GET['plugins'] );
@@ -106 +106 @@
                         else
                                 $plugins = array();
-                        
+
                         $title = __( 'Upgrade Plugins' );
                         $parent_file = 'plugins.php';
 
                         require_once( 'admin-header.php' );
-                        
+
                         echo '<div class="wrap">';
                         screen_icon();

trunk/wp-admin/tools.php

@@ -91 +91 @@
 $tags = get_taxonomy('post_tag');
 
-if ( current_user_can($cats->manage_cap) || current_user_can($tags->manage_cap) ) : ?> 
-<div class="tool-box"> 
+if ( current_user_can($cats->manage_cap) || current_user_can($tags->manage_cap) ) : ?>
+<div class="tool-box">
     <h3 class="title"><?php _e('Category&#47;Tag Conversion') ?></h3>
-    <p><?php printf(__('Use this to convert <a href="%s">categories to tags</a>, or <a href="%s">tags to categories</a>.'), 'admin.php?import=wp-cat2tag', 'admin.php?import=wp-cat2tag&amp;step=3'); ?></p> 
-</div> 
+    <p><?php printf(__('Use this to convert <a href="%s">categories to tags</a>, or <a href="%s">tags to categories</a>.'), 'admin.php?import=wp-cat2tag', 'admin.php?import=wp-cat2tag&amp;step=3'); ?></p>
+</div>
 <?php
-endif; 
+endif;
 
 do_action( 'tool_box' );

trunk/wp-admin/update-core.php

@@ -268 +268 @@
         foreach ( (array) $themes as $stylesheet => $theme_data) {
                 $screenshot = $theme_data->{'Theme Root URI'} . '/' . $stylesheet . '/' . $theme_data->Screenshot;
-                
+
                 echo "
         <tr class='active'>

trunk/wp-admin/update.php

@@ -43 +43 @@
 
                 iframe_footer();
-                        
+
         } elseif ( 'upgrade-plugin' == $action ) {
                 if ( ! current_user_can('update_plugins') )

trunk/wp-admin/upload.php

@@ -397 +397 @@
                         echo esc_html( strtoupper( $matches[1] ) );
                 else
-                        echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );  
+                        echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
                 ?>
 

trunk/wp-includes/default-filters.php

@@ -87 +87 @@
 }
 
-// Format titles 
+// Format titles
 foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title' ) as $filter ) {
         add_filter( $filter, 'wptexturize' );

trunk/wp-includes/default-widgets.php

@@ -1030 +1030 @@
 
         function _get_current_taxonomy($instance) {
-                if ( !empty($instance['taxonomy']) && is_taxonomy($instance['taxonomy']) ) 
+                if ( !empty($instance['taxonomy']) && is_taxonomy($instance['taxonomy']) )
                         return $instance['taxonomy'];
 
@@ -1048 +1048 @@
                 parent::WP_Widget( 'nav_menu', __('Navigation Menu'), $widget_ops );
         }
-        
+
         function widget($args, $instance) {
                 // Get menu
                 $nav_menu = wp_get_nav_menu_object( $instance['nav_menu'] );
-                
+
                 if ( !$nav_menu )
-                        return;         
-                
+                        return;
+
                 echo $args['before_widget'];
-                
+
                 if ( isset($instance['title']) )
                         echo $args['before_title'] . $instance['title'] . $args['after_title'];
-                
+
                 wp_nav_menu( array( 'menu' => $nav_menu ) );
-                
+
                 echo $args['after_widget'];
         }
@@ -1075 +1075 @@
                 $title = isset( $instance['title'] ) ? $instance['title'] : '';
                 $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
-                
+
                 // Get menus
                 $menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
-                
+
                 // If no menus exists, direct the user to go and create some.
                 if ( !$menus ) {

trunk/wp-includes/formatting.php

@@ -757 +757 @@
  *
  * @since 3.0.0
- * 
+ *
  * @param string $key String key
  * @return string Sanitized key

trunk/wp-includes/functions.php

@@ -1826 +1826 @@
                                 continue;
                         if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
-                                continue;                               
+                                continue;
 
                         // If visiting repair.php, return true and let it take over.

trunk/wp-includes/l10n.php

@@ -317 +317 @@
 /**
  * Unloads translations for a domain
- * 
+ *
  * @since 3.0.0
  * @param string $domain Textdomain to be unloaded

trunk/wp-includes/link-template.php

@@ -2060 +2060 @@
  *
  * @since 3.0.0.
- * 
+ *
  * @param int $id A post or blog id.  Default is 0, which means the current post or blog.
  * @param string $contex Whether the id is a 'blog' id, 'post' id, or 'media' id.  If 'post', the post_type of the post is consulted.  If 'query', the current query is consulted to determine the id and context. Default is 'post'.

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

@@ -26 +26 @@
         $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true,
         'fallback_cb' => 'wp_page_menu', 'before_link' => '', 'after_link' => '', 'before_title' => '', 'after_title' => '', );
-        
+
         $args = wp_parse_args( $args, $defaults );
         $args = apply_filters( 'wp_nav_menu_args', $args );
@@ -33 +33 @@
         // Get the nav menu
         $menu = wp_get_nav_menu_object( $args->menu );
-                
+
         // If we couldn't find a menu based off the name, id or slug,
         // get the first menu that has items.
@@ -52 +52 @@
         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 .'>';
@@ -64 +64 @@
         if ( 'div' == $args->container )
                 $nav_menu .= '</div>';
-        
+
         $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
 
@@ -86 +86 @@
         $defaults = array( 'menu' => '', 'menu_class' => 'menu', 'context' => 'frontend',
         'fallback_cb' => '', 'before_link' => '', 'after_link' => '', 'before_title' => '', 'after_title' => '', );
-        
+
         $args = wp_parse_args( $args, $defaults );
         $args = apply_filters( 'wp_get_nav_menu_args', $args );
         $args = (object) $args;
-        
+
         // Variable setup
         $nav_menu = '';
@@ -97 +97 @@
         $parent_stack = array();
         $parent_menu_order = array();
-        
+
         // 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, 'backend' );
-        
+
         // 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) ) ) {
@@ -112 +112 @@
                 }
         }
-        
+
         foreach ( $menu_items as $key => $menu_item ) {
                 // Set up the $menu_item variables
@@ -120 +120 @@
                 $maybe_value = 'frontend' == $args->context ? '' : ' value="'. $menu_item->ID .'"';
                 $classes = 'frontend' == $args->context ? ' class="menu-item-type-'. $type . $menu_item->li_class .'"' : '';
-                
+
                 $items .= '<li id="menu-item-'. $menu_item->ID .'"'. $maybe_value . $classes .'>';
                 $items .= wp_get_nav_menu_item( $menu_item, $args->context, $args );
-                
+
                 // Indent children
                 $last_item = ( count( $menu_items ) == $menu_item->menu_order );
@@ -142 +142 @@
                 }
         }
-        
+
         // 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 ) {
@@ -155 +155 @@
                 $nav_menu .= $items;
         }
-        
+
         $nav_menu .= '</ul>';
-        
+
         return apply_filters( 'wp_get_nav_menu', $nav_menu );
 }
@@ -180 +180 @@
                         $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_link );
                         $output .= '<a'. $attributes .'>';
@@ -186 +186 @@
                         $output .= '</a>';
                         $output .= esc_html( $args->after_link );
-                        
-                        break;
-                
+
+                        break;
+
                 case 'backend':
                         $output .= '<dl><dt>';
@@ -205 +205 @@
                         }
                         $output .= '<span class="item-type">'. esc_html($label) .'</span>';
-                        
+
                         // Actions
                         $output .= '<a class="item-edit thickbox" id="edit'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'" 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->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'">'. __('Delete') .'</a>';
-                        
+
                         $output .= '</dt></dl>';
-                        
+
                         // Menu Item Settings
                         $output .= '<input type="hidden" name="menu-item-db-id[]" id="menu-item-db-id'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->ID ) .'" />';
@@ -227 +227 @@
                         $output .= '<input type="hidden" name="menu-item-target[]" id="menu-item-target'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->target ) .'" />';
                         break;
-                
+
                 case 'custom':
                         $menu_id = 'menu-item-' . $menu_item->db_id;
                         $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
-                        
+
                         // Menu item hidden fields
                         $output .= '<input type="hidden" class="menu-item-db-id" value="'. esc_attr( $menu_item->db_id ) .'" />';
@@ -246 +246 @@
                         $output .= '<input type="hidden" class="menu-item-xfn" value="'. esc_attr( $menu_item->xfn ) .'" />';
                         break;
-                
+
                 case 'taxonomy':
                 case 'post_type':
                         $menu_id = 'menu-item-' . $menu_item->db_id;
                         $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" 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" />';
@@ -263 +263 @@
                         break;
         }
-        
+
         return $output;
 }

trunk/wp-includes/nav-menu.php

@@ -119 +119 @@
  *
  * @param string $menu menu name, id, or slug
- * @param string $args 
+ * @param string $args
  * @return mixed $items array of menu items, else false.
  */
 function wp_get_nav_menu_items( $menu, $args = array() ) {
         $menu = wp_get_nav_menu_object( $menu );
-        
+
         if ( !$menu )
                 return false;
-        
+
         $items = get_objects_in_term( $menu->term_id, 'nav_menu' );
 
@@ -133 +133 @@
                 $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
                 $args = wp_parse_args( $args, $defaults );
-                if ( count( $items ) > 1 )      
+                if ( count( $items ) > 1 )
                         $args['include'] = implode( ',', $items );
                 else
@@ -165 +165 @@
 function wp_setup_nav_menu_item( $menu_item, $menu_item_type = null, $menu_item_object = '' ) {
         global $wp_query;
-        
+
         switch ( $menu_item_type ) {
                 case 'frontend':
@@ -174 +174 @@
 
                         $menu_item->append = get_post_meta( $menu_item->ID, 'menu_item_append', true );
-                        
+
                         $menu_item->title = $menu_item->post_title;
                         $menu_item->url = get_post_meta( $menu_item->ID, 'menu_item_url', true );
                         $menu_item->target = get_post_meta( $menu_item->ID, 'menu_item_target', true );
-                        
+
                         $menu_item->attr_title = strip_tags( $menu_item->post_excerpt );
                         $menu_item->description = strip_tags( $menu_item->post_content );
-                        
+
                         $menu_item->classes = get_post_meta( $menu_item->ID, 'menu_item_classes', true );;
                         $menu_item->xfn = get_post_meta( $menu_item->ID, 'menu_item_xfn', true );
                         $menu_item->li_class = ( $menu_item->object_id == $wp_query->get_queried_object_id() ) ? ' current_page_item' : '';
                         break;
-                        
+
                 case 'custom':
                         $menu_item->db_id = (int) $menu_item->ID;
@@ -193 +193 @@
                         $menu_item->type = 'custom'; //$menu_item_type
                         $menu_item->append = 'custom';
-                        
+
                         $menu_item->attr_title = strip_tags( $menu_item->post_excerpt );
                         $menu_item->description = strip_tags( $menu_item->post_content );
@@ -201 +201 @@
                         $menu_item->target = get_post_meta( $menu_item->ID, 'menu_item_target', true );
                         break;
-                        
+
                 case 'post_type':
                         $menu_item->db_id = 0;
@@ -207 +207 @@
                         $menu_item->parent_id = (int) $menu_item->post_parent;
                         $menu_item->type = $menu_item_type;
-                        
+
                         $object = get_post_type_object( $menu_item_object );
                         $menu_item->append = $object->name;
@@ -214 +214 @@
                         $menu_item->url = get_permalink( $menu_item->ID );
                         $menu_item->target = '_self';
-                        
+
                         $menu_item->attr_title = '';
                         $menu_item->description = strip_tags( $menu_item->post_content );
                         break;
-                        
+
                 case 'taxonomy':
                         $menu_item->ID = $menu_item->term_id;
@@ -225 +225 @@
                         $menu_item->parent_id = (int) $menu_item->parent;
                         $menu_item->type = $menu_item_type;
-                        
+
                         $object = get_taxonomy( $menu_item_object );
                         $menu_item->append = $object->name;
@@ -239 +239 @@
         $menu_item->classes = get_post_meta( $menu_item->ID, 'menu_item_classes', true );
         $menu_item->xfn = get_post_meta( $menu_item->ID, 'menu_item_xfn', true );
-        
+
         return $menu_item;
 }

trunk/wp-includes/pluggable.php

@@ -167 +167 @@
 
         $results = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($list)");
-    
+
         _fill_many_users($results);
 }

trunk/wp-includes/post.php

@@ -2931 +2931 @@
         $number = (int) $number;
         $offset = (int) $offset;
-        
+
         // Make sure the post type is hierarchical
         $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
         if ( !in_array( $post_type, $hierarchical_post_types ) )
                 return false;
-        
+
         // Make sure we have a valid post status
         if ( !in_array($post_status, get_post_stati()) )
@@ -3032 +3032 @@
         if ( $parent >= 0 )
                 $where .= $wpdb->prepare(' AND post_parent = %d ', $parent);
-                
+
         $where_post_type = $wpdb->prepare( "post_type = '%s' AND post_status = '%s'", $post_type, $post_status );
 
@@ -3179 +3179 @@
                 else
                         $post_category = array();
-        }       
+        }
 
         // Are we updating or creating?
@@ -3815 +3815 @@
         if ( $lastpostmodified )
                 return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
-        
+
         switch ( strtolower($timezone) ) {
                 case 'gmt':
@@ -3827 +3827 @@
                         break;
         }
-        
+
         $lastpostdate = get_lastpostdate($timezone);
         if ( $lastpostdate > $lastpostmodified )
                 $lastpostmodified = $lastpostdate;
 
-        if ( $lastpostmodified ) 
-                wp_cache_set( "lastpostmodified:$timezone", $lastpostmodified, 'timeinfo' ); 
+        if ( $lastpostmodified )
+                wp_cache_set( "lastpostmodified:$timezone", $lastpostmodified, 'timeinfo' );
 
         return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );

trunk/wp-includes/query.php

@@ -225 +225 @@
  *
  * If no taxonomy argument is set, returns true if any taxonomy is queried.
- * If the taxonomy argument is passed but no term argument, returns true 
+ * If the taxonomy argument is passed but no term argument, returns true
  *    if the taxonomy or taxonomies in the argument are being queried.
- * If both taxonomy and term arguments are passed, returns true 
+ * If both taxonomy and term arguments are passed, returns true
  *    if the current query is for a term contained in the terms argument
  *    which has a taxonomy contained in the taxonomy argument.
@@ -254 +254 @@
                 return isset($queried_object->taxonomy) && count( $tax_array ) && in_array($queried_object->taxonomy, $tax_array);
 
-        return isset($queried_object->term_id) && 
+        return isset($queried_object->term_id) &&
                         count(array_intersect(
-                                array($queried_object->term_id, $queried_object->name, $queried_object->slug), 
+                                array($queried_object->term_id, $queried_object->name, $queried_object->slug),
                                 $term_array
                         ));

trunk/wp-includes/rewrite.php

@@ -1781 +1781 @@
                         $siteurl = get_option( 'siteurl' );
                         $siteurl_len = strlen( $siteurl );
-                        if ( substr( WP_CONTENT_URL, 0, $siteurl_len ) == $siteurl && strlen( WP_CONTENT_URL ) > $siteurl_len ) 
+                        if ( substr( WP_CONTENT_URL, 0, $siteurl_len ) == $siteurl && strlen( WP_CONTENT_URL ) > $siteurl_len )
                                 $content_path = substr( WP_CONTENT_URL, $siteurl_len + 1 );
                         else
-                                $content_path = 'wp-content'; 
+                                $content_path = 'wp-content';
                         $rules = '<rule name="wordpress - strip index.php" stopProcessing="false">
                                         <match url="^index.php/(.*)$" />

trunk/wp-includes/taxonomy.php

@@ -161 +161 @@
 function is_taxonomy( $taxonomy ) {
         global $wp_taxonomies;
-                
+
         return isset($wp_taxonomies[$taxonomy]);
 }
@@ -262 +262 @@
 
         if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
-                $args['rewrite'] = wp_parse_args($args['rewrite'], array( 
-                        'slug' => sanitize_title_with_dashes($taxonomy), 
-                        'with_front' => true, 
-                )); 
-                $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term="); 
-                $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']); 
+                $args['rewrite'] = wp_parse_args($args['rewrite'], array(
+                        'slug' => sanitize_title_with_dashes($taxonomy),
+                        'with_front' => true,
+                ));
+                $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+                $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
         }
 

trunk/wp-signup.php

@@ -236 +236 @@
         else
                 $signup[ 'blog' ] = 'checked="checked"';
-                
+
         //TODO - This doesn't seem to do anything do we really need it?
         $signup['user'] = isset( $signup['user'] ) ? $signup['user'] : '';