Changeset 15843

Timestamp:

10/19/2010 07:48:22 AM (9 years ago)

Author:

nacin

Message:

Pinking shears.

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/css/nav-menu.dev.css (modified) (1 diff)
• wp-admin/custom-header.php (modified) (2 diffs)
• wp-admin/includes/bookmark.php (modified) (2 diffs)
• wp-admin/includes/default-list-tables.php (modified) (18 diffs)
• wp-admin/includes/list-table.php (modified) (4 diffs)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/js/list-table.dev.js (modified) (1 diff)
• wp-admin/js/nav-menu.dev.js (modified) (1 diff)
• wp-admin/js/theme.dev.js (modified) (3 diffs)
• wp-admin/network/edit.php (modified) (1 diff)
• wp-admin/options-general.php (modified) (1 diff)
• wp-admin/themes.php (modified) (2 diffs)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/ms-blogs.php (modified) (3 diffs)
• wp-includes/ms-functions.php (modified) (2 diffs)
• wp-includes/nav-menu-template.php (modified) (5 diffs)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/query.php (modified) (3 diffs)
• wp-includes/taxonomy.php (modified) (8 diffs)
• wp-includes/theme-compat/comments-popup.php (modified) (1 diff)
• wp-includes/theme-compat/comments.php (modified) (4 diffs)
• wp-includes/theme-compat/footer.php (modified) (1 diff)
• wp-includes/theme-compat/header.php (modified) (1 diff)
• wp-includes/theme-compat/sidebar.php (modified) (1 diff)
• wp-includes/user.php (modified) (4 diffs)
• wp-includes/wp-db.php (modified) (3 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -216 +216 @@
 } else {
     do_action("load-$pagenow");
-    // Backwards compatibility with old load-page-new.php, load-page.php,   
-    // and load-categories.php actions.  
-    if ( $typenow == 'page' ) {  
-        if ( $pagenow == 'post-new.php' )  
-            do_action( 'load-page-new.php' );  
-        elseif ( $pagenow == 'post.php' )  
-            do_action( 'load-page.php' );  
+    // Backwards compatibility with old load-page-new.php, load-page.php, 
+    // and load-categories.php actions.
+    if ( $typenow == 'page' ) {
+        if ( $pagenow == 'post-new.php' )
+            do_action( 'load-page-new.php' );
+        elseif ( $pagenow == 'post.php' )
+            do_action( 'load-page.php' );
     }  elseif ( $taxnow == 'category' && $pagenow == 'edit-tags.php' ) {
         do_action( 'load-categories.php' );

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

@@ -96 +96 @@
         font-weight:bold;
     }
-    
+
 #nav-menu-footer {
     border-width: 0 1px 1px 1px;

trunk/wp-admin/custom-header.php

@@ -559 +559 @@
 </table>
     <?php endif;
-    
-do_action( 'custom_header_options' ); 
+
+do_action( 'custom_header_options' );
 
 wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
@@ -645 +645 @@
     <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
     <?php wp_nonce_field( 'custom-header-crop-image' ) ?>
-    
+
     <?php submit_button( __( 'Crop and Publish' ) ); ?>
     </p>

trunk/wp-admin/includes/bookmark.php

@@ -121 +121 @@
 
 /**
- * This function inserts/updates links into/in the database. 
+ * This function inserts/updates links into/in the database.
  *
  * @since 2.0.0
@@ -222 +222 @@
  *
  * @param int $link_id ID of link to update
- * @param array $link_categories Array of categories to 
+ * @param array $link_categories Array of categories to
  */
 function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {

trunk/wp-admin/includes/default-list-tables.php

@@ -86 +86 @@
 
         $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
-        $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type ); 
+        $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
 
         if ( $this->hierarchical_display )
@@ -162 +162 @@
             $status_links[$status_name] = "<li><a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
         }
-        
+    
         return $status_links;
     }
@@ -736 +736 @@
 
             if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
-                $users_opt = array( 
-                    'name' => 'post_author', 
-                    'class'=> 'authors', 
-                    'multi' => 1, 
-                    'echo' => 0 
+                $users_opt = array(
+                    'name' => 'post_author',
+                    'class'=> 'authors',
+                    'multi' => 1,
+                    'echo' => 0
                 );
                 if ( $bulk )
@@ -999 +999 @@
         if ( !current_user_can('upload_files') )
             wp_die( __( 'You do not have permission to upload files.' ) );
-    }       
+    }   
 
     function prepare_items() {
@@ -1489 +1489 @@
 
         $this->callback_args = $args;
-        
+    
         $this->set_pagination_args( array(
             'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
-            'per_page' => $tags_per_page,       
+            'per_page' => $tags_per_page,   
         ) );
     }
@@ -1678 +1678 @@
         return $out;
     }
-    
+
     function column_description( $tag ) {
         return $tag->description;
@@ -1712 +1712 @@
     function column_default( $tag, $column_name ) {
         global $taxonomy;
-    
+
         return apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id );
         $out .= "</td>";
@@ -1821 +1821 @@
 
         $this->items = $wp_user_search->get_results();
-        
+    
         $this->set_pagination_args( array(
             'total_items' => $wp_user_search->get_total(),
-            'per_page' => $users_per_page,      
+            'per_page' => $users_per_page,  
         ) );
     }
@@ -1889 +1889 @@
 <?php
     }
-    
+
     function current_action() {
         if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) )
@@ -2564 +2564 @@
 
         $this->items = get_bookmarks( $args );
-    }       
+    }   
 
     function no_items() {
@@ -2725 +2725 @@
     }
 
-    function check_permissions() {      
+    function check_permissions() {  
         if ( ! current_user_can( 'manage_sites' ) )
             wp_die( __( 'You do not have permission to access this page.' ) );
@@ -3015 +3015 @@
         if ( !is_multisite() )
             wp_die( __( 'Multisite support is not enabled.' ) );
-    
+
         if ( ! current_user_can( 'manage_network_users' ) )
             wp_die( __( 'You do not have permission to access this page.' ) );
@@ -3046 +3046 @@
 
         $this->items = $wp_user_search->get_results();
-        
+    
         $this->set_pagination_args( array(
             'total_items' => $wp_user_search->get_total(),
-            'per_page' => $users_per_page,      
+            'per_page' => $users_per_page,  
         ) );
     }
@@ -3368 +3368 @@
             uasort( $this->items, '_order_plugins_callback' );
         }
-        
+    
         $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
 
@@ -3417 +3417 @@
     function get_views() {
         global $totals, $status;
-    
+
         $status_links = array();
         foreach ( $totals as $type => $count ) {
@@ -3453 +3453 @@
             }
 
-            $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>", 
+            $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>",
                 add_query_arg('plugin_status', $type, 'plugins.php'),
                 ( $type == $status ) ? ' class="current"' : '',
@@ -3641 +3641 @@
     function check_permissions() {
         if ( ! current_user_can('install_plugins') )
-            wp_die(__('You do not have sufficient permissions to install plugins on this site.'));      
+            wp_die(__('You do not have sufficient permissions to install plugins on this site.'));  
     }
 
@@ -4082 +4082 @@
         include( ABSPATH . 'wp-admin/includes/theme-install.php' );
 
-        global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;        
-        
+        global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;    
+    
         wp_reset_vars( array( 'tab' ) );
 

trunk/wp-admin/includes/list-table.php

@@ -262 +262 @@
         if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
             return $_REQUEST['action2'];
-        
+    
         return false;
     }
@@ -399 +399 @@
     function get_pagenum( $query_var = 'paged' ) {
         $pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0;
-    
+
         return max( 1, $pagenum );
     }
@@ -410 +410 @@
      *
      * @return int
-     */ 
+     */
     function get_items_per_page( $option, $default = 20 ) {
         $per_page = (int) get_user_option( $option );
@@ -622 +622 @@
      *
      * @return array
-     */ 
+     */
     function get_table_classes() {
         extract( $this->_args );

trunk/wp-admin/includes/meta-boxes.php

@@ -509 +509 @@
 <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
 <?php
-    wp_dropdown_users( array( 
-        'name' => 'post_author_override', 
+    wp_dropdown_users( array(
+        'name' => 'post_author_override',
         'selected' => empty($post->ID) ? $user_ID : $post->post_author
     ) );

trunk/wp-admin/includes/template.php

@@ -2073 +2073 @@
     $current_screen->is_network = is_network_admin() ? true : false;
     $current_screen->is_user = is_user_admin() ? true : false;
-    
+
     if ( $current_screen->is_network ) {
         $current_screen->base .= '-network';

trunk/wp-admin/js/list-table.dev.js

@@ -78 +78 @@
 
         this.fetch_list(
-            data, 
+            data,
             $.proxy(this, 'handle_success'),
             $.proxy(this, 'handle_error')

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

@@ -919 +919 @@
                     if ( newID != matched[1] ) {
                         $item.html( $item.html().replace(new RegExp(
-                            'menu-item\\[' + matched[1] + '\\]', 'g'), 
+                            'menu-item\\[' + matched[1] + '\\]', 'g'),
                             'menu-item[' + newID + ']'
                         ) );

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

@@ -48 +48 @@
                 opts.search = $( 'input[name=s]' ).val();
                 opts.order  = document.location.href.match( /order=(\w*)/ ) ? document.location.href.match( /order=(\w*)/ )[1] : 'random';
-                
+            
                 $( '#availablethemes td' ).fadeTo( 500, 0.1, function() {
                     $( '#availablethemes td img' ).hide();
@@ -56 +56 @@
             });
         }
-        
+    
         // These are the functions we expose
         var api = {
@@ -69 +69 @@
     theme_viewer = new ThemeViewer();
     theme_viewer.init();
-}); 
+});

trunk/wp-admin/network/edit.php

@@ -75 +75 @@
         }
     }
-    
+
     submit_button( __('Confirm Deletion'), 'delete' );
     ?>

trunk/wp-admin/options-general.php

@@ -50 +50 @@
                     action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
                     date : format.val(),
-                }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );   
+                }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
         });
     });

trunk/wp-admin/themes.php

@@ -111 +111 @@
     }
     echo implode ( ' | ', $options );
-    
+
     if ( $ct->tags ) : ?>
     <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>
@@ -147 +147 @@
     <?php foreach ( $feature_list as $feature_name => $features ) :
             $feature_name = esc_html( $feature_name ); ?>
-        
+    
         <div class="feature-container">
             <div class="feature-name"><?php echo $feature_name ?></div>

trunk/wp-includes/canonical.php

@@ -343 +343 @@
     if ( !$redirect_url || $redirect_url == $requested_url )
         return false;
-        
-    // Hex encoded octets are case-insensitive. 
+    
+    // Hex encoded octets are case-insensitive.
     if ( false !== strpos($requested_url, '%') ) {
         if ( !function_exists('lowercase_octets') ) {
-            function lowercase_octets($matches) { 
-                return strtolower( $matches[0] ); 
-            } 
+            function lowercase_octets($matches) {
+                return strtolower( $matches[0] );
+            }
         }
         $requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);

trunk/wp-includes/category-template.php

@@ -964 +964 @@
 /**
  * Check if the current post has any of given terms.
- * 
+ *
  * The given terms are checked against the post's terms' term_ids, names and slugs.
  * Terms given as integers will only be checked against the post's terms' term_ids.

trunk/wp-includes/comment.php

@@ -312 +312 @@
         wp_cache_add( $cache_key, $comments, 'comment' );
 
-        return $comments;   
+        return $comments;
     }
 }

trunk/wp-includes/functions.php

@@ -4343 +4343 @@
  *
  * @since 3.1.0
- * @access private 
+ * @access private
  *
  * @param callback $callback function that accepts ( ID, callback_arg, ... ) and outputs parent_ID

trunk/wp-includes/general-template.php

@@ -655 +655 @@
         return;
 
-    
+
     $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
     $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
@@ -664 +664 @@
         return $title;
 }
-    
+
 /**
  * Display or retrieve page title for category archive.

trunk/wp-includes/link-template.php

@@ -859 +859 @@
  *
  * @param string $post_type Post type
- * @param string $feed Optional. Feed type 
- * @return string
- */ 
+ * @param string $feed Optional. Feed type
+ * @return string
+ */
 function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
     $default_feed = get_default_feed();

trunk/wp-includes/ms-blogs.php

@@ -117 +117 @@
  *
  * @since MU
- * 
+ *
  * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against.
  * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
@@ -489 +489 @@
         $wpdb->suppress_errors( false );
     }
- 
+
     if ( did_action('init') ) {
-        $current_user = wp_get_current_user();  
+        $current_user = wp_get_current_user();
         if ( is_object( $current_user ) )
             $current_user->for_blog( $blog_id );
@@ -664 +664 @@
  *
  * @since MU
- * 
+ *
  * @param $deprecated Not used
  * @param int $start The offset

trunk/wp-includes/ms-functions.php

@@ -125 +125 @@
  * @since MU 1.1
  * @uses get_blogs_of_user()
- * 
+ *
  * @param int $user_id The unique ID of the user
  * @param int $blog Optional. If no blog_id is provided, current site is used
@@ -269 +269 @@
  * users are removed from a blog.
  *
- * Accepts an optional $reassign parameter, if you want to 
+ * Accepts an optional $reassign parameter, if you want to
  * reassign the user's blog posts to another user upon removal.
  *

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

@@ -197 +197 @@
 
     unset($menu_items);
-    
+
     $sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args );
 
@@ -315 +315 @@
 
     foreach ( (array) $menu_items as $key => $menu_item ) {
-        
+    
         $menu_items[$key]->current = false;
-        
+    
         $classes = (array) $menu_item->classes;
         $classes[] = 'menu-item';
@@ -363 +363 @@
             $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
             $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
-            
+        
             if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
                 $classes[] = 'current-menu-item';
@@ -384 +384 @@
                 $active_object = $menu_item->object;
             }
-            
+        
             if ( untrailingslashit($item_url) == home_url() )
                 $classes[] = 'menu-item-home';
@@ -404 +404 @@
         $menu_items[$key]->current_item_ancestor = false;
         $menu_items[$key]->current_item_parent = false;
-        
+    
         if (
             isset( $parent_item->type ) &&

trunk/wp-includes/post.php

@@ -497 +497 @@
  * @since 3.1.0
  * @uses has_term()
- * 
+ *
  * @param string $format The format to check for
  * @param object|id $post The post to check. If not supplied, defaults to the current post if used in the loop.
@@ -3813 +3813 @@
  * Checked for changed slugs for published post objects and save the old slug.
  *
- * The function is used when a post object of any type is updated, 
+ * The function is used when a post object of any type is updated,
  * by comparing the current and previous post objects.
  *

trunk/wp-includes/query.php

@@ -104 +104 @@
  *
  * If the $post_types parameter is specified, this function will additionally
- * check if the query is for exactly one of the post types specified. If a plugin 
+ * check if the query is for exactly one of the post types specified. If a plugin
  * is causing multiple post types to appear in the query, specifying a post type
  * will cause this check to return false.
@@ -136 +136 @@
     return $wp_query->is_post_type_archive( $post_types );
 }
-    
+
 /**
  * Is the query for an attachment page?
@@ -2649 +2649 @@
      *
      * If the $post_types parameter is specified, this function will additionally
-     * check if the query is for exactly one of the post types specified. If a plugin 
+     * check if the query is for exactly one of the post types specified. If a plugin
      * is causing multiple post types to appear in the query, specifying a post type
      * will cause this check to return false.

trunk/wp-includes/taxonomy.php

@@ -504 +504 @@
                     $term = $term->term_id;
                 else
-                    continue;                   
+                    continue;               
             }
             $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
@@ -1447 +1447 @@
 
     $defaults = array();
-    
+
     if ( 'category' == $taxonomy ) {
         $defaults['default'] = get_option( 'default_category' );
@@ -1453 +1453 @@
             return 0; // Don't delete the default category
     }
-    
+
     $args = wp_parse_args($args, $defaults);
     extract($args, EXTR_SKIP);
@@ -2642 +2642 @@
     }
     // Back Compat filters.
-    if ( 'post_tag' == $taxonomy ) 
+    if ( 'post_tag' == $taxonomy )
         $termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
     elseif ( 'category' == $taxonomy )
@@ -2816 +2816 @@
     return false;
 }
- 
+
 /**
  * Get an array of ancestor IDs for a given object.
@@ -2826 +2826 @@
 function get_ancestors($object_id = 0, $object_type = '') {
     $object_id = (int) $object_id;
- 
+
     $ancestors = array();
 
@@ -2832 +2832 @@
         return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
     }
-        
+    
     if ( is_taxonomy_hierarchical( $object_type ) ) {
         $term = get_term($object_id, $object_type);
@@ -2841 +2841 @@
     } elseif ( null !== get_post_type_object( $object_type ) ) {
         $object = get_post($object_id);
-        if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) ) 
+        if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) )
             $ancestors = $object->ancestors;
         else {

trunk/wp-includes/theme-compat/comments-popup.php

@@ -4 +4 @@
  * @subpackage Theme_Compat
  * @deprecated 3.0
- * 
+ *
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
- * 
+ *
  */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );

trunk/wp-includes/theme-compat/comments.php

@@ -4 +4 @@
  * @subpackage Theme_Compat
  * @deprecated 3.0
- * 
+ *
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
- * 
+ *
  */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
@@ -13 +13 @@
     if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
         die ('Please do not load this page directly. Thanks!');
-    
+
     if ( post_password_required() ) { ?>
-        <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p> 
+        <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
     <?php
         return;
@@ -59 +59 @@
 <h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
 
-<div id="cancel-comment-reply"> 
+<div id="cancel-comment-reply">
     <small><?php cancel_comment_reply_link() ?></small>
-</div> 
+</div>
 
 <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
@@ -91 +91 @@
 
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
-<?php comment_id_fields(); ?> 
+<?php comment_id_fields(); ?>
 </p>
 <?php do_action('comment_form', $post->ID); ?>

trunk/wp-includes/theme-compat/footer.php

@@ -4 +4 @@
  * @subpackage Theme_Compat
  * @deprecated 3.0
- * 
+ *
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
- * 
+ *
  */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );

trunk/wp-includes/theme-compat/header.php

@@ -4 +4 @@
  * @subpackage Theme_Compat
  * @deprecated 3.0
- * 
+ *
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
- * 
+ *
  */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );

trunk/wp-includes/theme-compat/sidebar.php

@@ -4 +4 @@
  * @subpackage Theme_Compat
  * @deprecated 3.0
- * 
+ *
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
- * 
+ *
  */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );

trunk/wp-includes/user.php

@@ -643 +643 @@
     $order_meta    = get_user_meta( $user_id, 'blog_order' );
     $visible_meta  = get_user_meta( $user_id, 'blog_visibility' );
-    
+
     $order = $order_meta;
     if ( !is_array( $order ) )
@@ -651 +651 @@
     if ( !is_array( $visible ) )
         $visible = array();
-    
+
     // Index the blogs by userblog_id and set the visibility flag
     // Visibility is on by default, unless a linked site then off
@@ -668 +668 @@
         if ( is_object( $id ) && isset( $id->userblog_id ) )
             $id = $id->userblog_id;
-            
+        
         if ( is_numeric( $id ) && isset( $newblogs[intval( $id )] ) ) {
             $ordered[$id] = $newblogs[$id];
@@ -725 +725 @@
 function is_blog_user( $blog_id = 0 ) {
     global $wpdb;
- 
+
     $current_user = wp_get_current_user();
     if ( !$blog_id )

trunk/wp-includes/wp-db.php

@@ -541 +541 @@
     /**
      * Sets the connection's character set.
-     * 
+     *
      * @param resource $dbh     The resource given by mysql_connect
      * @param string   $charset The character set (optional)
@@ -741 +741 @@
      */
     function select( $db, $dbh = null) {
-        if ( is_null($dbh) ) 
+        if ( is_null($dbh) )
             $dbh = $this->dbh;
 
@@ -1044 +1044 @@
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
 "/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
-            
+        
             //If show errors is disabled then we need to die anyway as we don't have a working DB connection
             die();

trunk/wp-login.php

@@ -262 +262 @@
     if ( empty( $user ) )
         return new WP_Error('invalid_key', __('Invalid key'));
-        
+    
     return $user;
 }