Changeset 12632

Timestamp:

01/07/2010 04:27:46 AM (17 years ago)

Author:

ryan

Message:

Strip trailing whites from ms files. see #11644

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (36 diffs)
• wp-admin/ms-admin.php (modified) (2 diffs)
• wp-admin/ms-edit.php (modified) (5 diffs)
• wp-admin/ms-options.php (modified) (1 diff)
• wp-admin/ms-sites.php (modified) (25 diffs)
• wp-admin/ms-upgrade-site.php (modified) (2 diffs)
• wp-admin/ms-users.php (modified) (8 diffs)
• wp-includes/ms-functions.php (modified) (36 diffs)
• wp-includes/ms-settings.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -48 +48 @@
 
         if ( $drop ) {
-                $drop_tables = $wpdb->get_results("show tables LIKE '". $wpdb->base_prefix . $blog_id . "\_%'", ARRAY_A); 
-                $drop_tables = apply_filters( 'wpmu_drop_tables', $drop_tables ); 
+                $drop_tables = $wpdb->get_results("show tables LIKE '". $wpdb->base_prefix . $blog_id . "\_%'", ARRAY_A);
+                $drop_tables = apply_filters( 'wpmu_drop_tables', $drop_tables );
 
                 reset( $drop_tables );
@@ -220 +220 @@
         );
         update_option( 'adminhash', $new_admin_email );
-        
+
         $content = apply_filters( 'new_admin_email_content', __("Dear user,
 
-You recently requested to have the administration email address on 
+You recently requested to have the administration email address on
 your blog changed.
 If this is correct, please click on the following link to change it:
@@ -236 +236 @@
 All at ###SITENAME###
 ###SITEURL###"), $new_admin_email );
-        
+
         $content = str_replace('###ADMIN_URL###', clean_url(get_option( "siteurl" ).'/wp-admin/options.php?adminhash='.$hash), $content);
         $content = str_replace('###EMAIL###', $value, $content);
         $content = str_replace('###SITENAME###', get_site_option( 'site_name' ), $content);
         $content = str_replace('###SITEURL###', 'http://' . $current_site->domain . $current_site->path, $content);
-        
+
         wp_mail( $value, sprintf(__('[%s] New Admin Email Address'), get_option('blogname')), $content );
 }
@@ -355 +355 @@
 function get_space_allowed() {
         $spaceAllowed = get_option("blog_upload_space");
-        if( $spaceAllowed == false ) 
+        if( $spaceAllowed == false )
                 $spaceAllowed = get_site_option("blog_upload_space");
         if( empty($spaceAllowed) || !is_numeric($spaceAllowed) )
@@ -377 +377 @@
         }
         ?>
-        <strong><?php printf(__('Used: %1s%% of %2s'), number_format($percentused), $space );?></strong> 
+        <strong><?php printf(__('Used: %1s%% of %2s'), number_format($percentused), $space );?></strong>
         <?php
 }
 
 // Display File upload quota on dashboard
-function dashboard_quota() {    
+function dashboard_quota() {
         if ( get_site_option( 'upload_space_check_disabled' ) ) {
                 return true;
@@ -413 +413 @@
 // Edit blog upload space setting on Edit Blog page
 function upload_space_setting( $id ) {
-        $quota = get_blog_option($id, "blog_upload_space"); 
+        $quota = get_blog_option($id, "blog_upload_space");
         if( !$quota )
                 $quota = '';
-        
+
         ?>
         <tr>
@@ -433 +433 @@
         if( $refresh == 1 )
                 refresh_user_details($id);
-        
+
         if( $pref == 'spam' ) {
-                if( $value == 1 ) 
+                if( $value == 1 )
                         do_action( "make_spam_user", $id );
                 else
@@ -446 +446 @@
 function refresh_user_details($id) {
         $id = (int) $id;
-        
+
         if ( !$user = get_userdata( $id ) )
                 return false;
@@ -465 +465 @@
 
         $dirName = trailingslashit( BLOGUPLOADDIR );
-        if (!(is_dir($dirName) && is_readable($dirName))) 
-                return; 
+        if (!(is_dir($dirName) && is_readable($dirName)))
+                return;
 
         $dir = dir($dirName);
@@ -513 +513 @@
         if ( isset( $_GET[ 'c' ] ) )
                 $c = (int)$_GET[ 'c' ];
-        
+
         if ( $c >= 5 ) {
                 wp_die( __( "You don&#8217;t have permission to view this blog. Please contact the system administrator." ) );
@@ -522 +522 @@
         $dashboard_blog = get_dashboard_blog();
         if( is_object( $blog ) ) {
-                $protocol = ( is_ssl() ? 'https://' : 'http://' ); 
+                $protocol = ( is_ssl() ? 'https://' : 'http://' );
                 wp_redirect( $protocol . $blog->domain . $blog->path . 'wp-admin/?c=' . $c ); // redirect and count to 5, "just in case"
                 exit;
         }
 
-        /* 
-           If the user is a member of only 1 blog and the user's primary_blog isn't set to that blog, 
+        /*
+           If the user is a member of only 1 blog and the user's primary_blog isn't set to that blog,
            then update the primary_blog record to match the user's blog
          */
@@ -541 +541 @@
                 }
                 $blog = get_blog_details( get_usermeta( $current_user->ID , 'primary_blog' ) );
-                $protocol = ( is_ssl() ? 'https://' : 'http://' ); 
+                $protocol = ( is_ssl() ? 'https://' : 'http://' );
                 wp_redirect( $protocol . $blog->domain . $blog->path . 'wp-admin/?c=' . $c ); // redirect and count to 5, "just in case"
                 exit;
@@ -559 +559 @@
                 $writing = array( 'ping_sites', 'mailserver_login', 'mailserver_pass', 'default_email_category', 'mailserver_port', 'mailserver_url' );
         }
-        $removed = array( 
+        $removed = array(
                 'general' => array( 'siteurl', 'home', 'admin_email', 'users_can_register', 'default_role' ),
                 'reading' => array( 'gzipcompression' ),
@@ -585 +585 @@
 
 function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
-        $flag = false;  
+        $flag = false;
         $output = array();
-                                        
+
         foreach ( (array) $lang_files as $val ) {
                 $code_lang = basename( $val, '.mo' );
-                
+
                 if ( $code_lang == 'en_US' ) { // American English
                         $flag = true;
@@ -603 +603 @@
                         $output[$translated] =  '<option value="'.$code_lang.'"'.(($current == $code_lang) ? ' selected="selected"' : '').'> '.$translated.'</option>';
                 }
-                
-        }                                               
-        
+
+        }
+
         if ( $flag === false ) { // WordPress english
                 $output[] = '<option value=""'.((empty($current)) ? ' selected="selected"' : '').'>'.__('English')."</option>";
         }
-        
+
         // Order by name
         uksort($output, 'strnatcasecmp');
-        
-        $output = apply_filters('mu_dropdown_languages', $output, $lang_files, $current);       
-        echo implode("\n\t", $output);  
+
+        $output = apply_filters('mu_dropdown_languages', $output, $lang_files, $current);
+        echo implode("\n\t", $output);
 }
 
@@ -763 +763 @@
         if ( !isset( $_GET['sitewide'] ) )
                 return false;
-                
+
         /* Add the plugin to the list of sitewide active plugins */
         $active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins' ) );
-        
+
         /* Add the activated plugin to the list */
         $active_sitewide_plugins[ $_GET['plugin'] ] = time();
@@ -776 +776 @@
         return true;
 }
-add_action( 'activate_' . $_GET['plugin'], 'activate_sitewide_plugin' ); 
+add_action( 'activate_' . $_GET['plugin'], 'activate_sitewide_plugin' );
 
 /**
@@ -786 +786 @@
         if ( !$plugin )
                 $plugin = $_GET['plugin'];
-                
+
         /* Get the active sitewide plugins */
         $active_sitewide_plugins = (array) maybe_unserialize( get_site_option( 'active_sitewide_plugins' ) );
@@ -798 +798 @@
         if ( !update_site_option( 'active_sitewide_plugins', $active_sitewide_plugins ) )
                 wp_redirect( 'plugins.php?error=true' );
-        
+
         return true;
 }
-add_action( 'deactivate_' . $_GET['plugin'], 'deactivate_sitewide_plugin' ); 
-add_action( 'deactivate_invalid_plugin', 'deactivate_sitewide_plugin' ); 
+add_action( 'deactivate_' . $_GET['plugin'], 'deactivate_sitewide_plugin' );
+add_action( 'deactivate_invalid_plugin', 'deactivate_sitewide_plugin' );
 
 /**
@@ -812 +812 @@
         if ( !is_site_admin() )
                 return false;
-        
+
         if ( 'sitewide-active' == $context )
                 return false;
-        
+
         if ( is_plugin_active( $file ) )
                 return false;
-                
+
         echo '<tr><td colspan="5" style="background: #f5f5f5; text-align: right;">';
 
@@ -835 +835 @@
         /* Open the plugin file for reading to check if this is a ms-plugin. */
         $fp = @fopen( WP_PLUGIN_DIR . '/' . $file, 'r' );
-        
+
         /* Pull only the first 8kiB of the file in. */
         $plugin_data = @fread( $fp, 8192 );
-        
+
         /* PHP will close file handle, but we are good citizens. */
         @fclose($fp);
-        
+
         if ( preg_match( '|Site Wide Only:(.*)true$|mi', $plugin_data ) )
                 return true;
@@ -859 +859 @@
         if ( !is_site_admin() )
                 return false;
-                
+
         $active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins') );
         $context = 'sitewide-active';
 
-        if ( $active_sitewide_plugins ) { 
+        if ( $active_sitewide_plugins ) {
 ?>
                 <h3><?php _e( 'Currently Active Site Wide Plugins' ) ?></h3>
-        
+
                 <p><?php _e( 'Plugins that appear in the list below are activate for all blogs across this installation.' ) ?></p>
 
@@ -899 +899 @@
 
                                 $plugin_data = $all_plugins[$plugin_file];
-                                
+
                                 echo "
                         <tr class='$context' style='background: #eef2ff;'>
@@ -932 +932 @@
                                 echo "</td>
                         </tr>\n";
-                        
+
                                 do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context );
                                 do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $context );
@@ -939 +939 @@
                         </tbody>
                 </table>
-                
+
                 <p><?php _e( 'Plugins that are enabled site wide can only be disabled by a site administrator.' ) ?></p>
-                
+
 <?php
         }
@@ -960 +960 @@
         }
 
-        /* Now unset any sitewide only plugins if the user is not a site admin */       
+        /* Now unset any sitewide only plugins if the user is not a site admin */
         if ( !is_site_admin() ) {
                 foreach ( $inactive_plugins as $plugin_name => $activated_time ) {
@@ -967 +967 @@
                 }
         }
-        
+
         return $inactive_plugins;
 }
@@ -984 +984 @@
                 unset( $active_plugins[ $sitewide_plugin ] );
         }
-        
+
         return $active_plugins;
 }
@@ -997 +997 @@
 function check_is_wpmu_plugin_on_activate() {
         /***
-         * On plugin activation on a blog level, check to see if this is actually a 
+         * On plugin activation on a blog level, check to see if this is actually a
          * site wide MU plugin. If so, deactivate and activate it site wide.
          */
         if ( is_wpmu_sitewide_plugin( $_GET['plugin'] ) || isset( $_GET['sitewide'] ) ) {
                 deactivate_plugins( $_GET['plugin'], true );
-                
+
                 /* Silently activate because the activate_* hook has already run. */
                 if ( is_site_admin() ) {
@@ -1023 +1023 @@
                                 if ( is_site_admin() )
                                         activate_sitewide_plugin( $plugin );
-                        }                       
+                        }
                 }
         }
@@ -1051 +1051 @@
                         ?>
                         <select name="primary_blog">
-                                <?php foreach( (array) $all_blogs as $blog ) { 
+                                <?php foreach( (array) $all_blogs as $blog ) {
                                         if( $primary_blog == $blog->userblog_id )
                                                 $found = true;
-                                        ?><option value='<?php echo $blog->userblog_id ?>'<?php if( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>>http://<?php echo $blog->domain.$blog->path ?></option><?php 
+                                        ?><option value='<?php echo $blog->userblog_id ?>'<?php if( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>>http://<?php echo $blog->domain.$blog->path ?></option><?php
                                 } ?>
                         </select>
@@ -1074 +1074 @@
         </tr>
         </table>
-        <?php   
+        <?php
 }
 add_action ( 'myblogs_allblogs_options', 'choose_primary_blog' );
@@ -1145 +1145 @@
         <?php
         do_action( 'myblogs_allblogs_options' );
-        ?><table class='widefat'> <?php 
+        ?><table class='widefat'> <?php
         $settings_html = apply_filters( 'myblogs_options', '', 'global' );
         if ( $settings_html != '' ) {
@@ -1166 +1166 @@
                 $split = $split + $cols;
         }
-  
+
         foreach( $rows as $row ) {
                 $c = $c == "alternate" ? "" : "alternate";
@@ -1217 +1217 @@
                         foreach( $rows as $row ) {
                                 $value = $row->meta_value;
-                                if ( !@unserialize( $value ) ) 
-                                        $value = stripslashes( $value ); 
+                                if ( !@unserialize( $value ) )
+                                        $value = stripslashes( $value );
                                 if ( $value !== $row->meta_value ) {
                                         update_site_option( $row->meta_key, $value );
@@ -1231 +1231 @@
                 foreach( $rows as $row ) {
                         $value = $row->option_value;
-                        if ( !@unserialize( $value ) ) 
-                                $value = stripslashes( $value ); 
+                        if ( !@unserialize( $value ) )
+                                $value = stripslashes( $value );
                         if ( $value !== $row->option_value ) {
                                 update_blog_option( $blog_id, $row->option_name, $value );

trunk/wp-admin/ms-admin.php

@@ -31 +31 @@
 
 <div class="wrap">
-        <h2><?php echo wp_specialchars( $title ); ?></h2> 
+        <h2><?php echo wp_specialchars( $title ); ?></h2>
 
         <ul class="subsubsub">
@@ -45 +45 @@
                 <p>
                         <input type="hidden" name="action" value="users" />
-                        <input type="text" name="s" value="" size="17" /> 
+                        <input type="text" name="s" value="" size="17" />
                         <input class="button" type="submit" name="submit" value="<?php esc_attr_e("Search Users"); ?>" />
-                </p> 
+                </p>
         </form>
 

trunk/wp-admin/ms-edit.php

@@ -11 +11 @@
 do_action('wpmuadminedit', '');
 
-if( isset($_GET[ 'id' ]) ) { 
-        $id = intval( $_GET[ 'id' ] ); 
-} elseif( isset($_POST[ 'id' ]) ) { 
-        $id = intval( $_POST[ 'id' ] ); 
+if( isset($_GET[ 'id' ]) ) {
+        $id = intval( $_GET[ 'id' ] );
+} elseif( isset($_POST[ 'id' ]) ) {
+        $id = intval( $_POST[ 'id' ] );
 }
 
@@ -144 +144 @@
                 if ( empty($domain) || empty($email))
                         wp_die( __('Missing blog address or email address.') );
-                if( !is_email( $email ) ) 
-                        wp_die( __('Invalid email address') ); 
+                if( !is_email( $email ) )
+                        wp_die( __('Invalid email address') );
 
                 if( constant( 'VHOST' ) == 'yes' ) {
@@ -219 +219 @@
                                 update_option( 'home', 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] );
                 }
-                        
+
                 $wp_rewrite->flush_rules();
 
@@ -318 +318 @@
                                         $blogfunction = 'all_spam';
                                         update_blog_status( $val, "spam", '1', 0 );
-                                        set_time_limit(60); 
+                                        set_time_limit(60);
                                 } elseif ( isset($_POST['allblog_notspam']) ) {
                                         $blogfunction = 'all_notspam';
                                         update_blog_status( $val, "spam", '0', 0 );
-                                        set_time_limit(60); 
+                                        set_time_limit(60);
                                 }
                         }
@@ -432 +432 @@
                                         <?php wp_nonce_field( $_GET['action2'] ) ?>
                                         <p><?php echo wp_specialchars( stripslashes($_GET['msg']) ); ?></p>
-                                        <p class="submit"><input class="button" type='submit' value='<?php _e("Confirm"); ?>' /></p>                                            
+                                        <p class="submit"><input class="button" type='submit' value='<?php _e("Confirm"); ?>' /></p>
                                 </form>
                         </body>

trunk/wp-admin/ms-options.php

@@ -281 +281 @@
                         <?php
                         $menu_perms = get_site_option( "menu_items" );
-                        $menu_items = apply_filters( 'mu_menu_items', array('plugins' => __('Plugins')) );                      
+                        $menu_items = apply_filters( 'mu_menu_items', array('plugins' => __('Plugins')) );
                         foreach ( (array) $menu_items as $key => $val ) {
                                 echo "<tr><th scope='row'>" . wp_specialchars($val) . "</th><td><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . (( $menu_perms[$key] == '1' ) ? ' checked="checked"' : '') . " /></td></tr>";

trunk/wp-admin/ms-sites.php

@@ -82 +82 @@
                 <form method="post" action="ms-edit.php?action=updateblog">
                         <?php wp_nonce_field('editblog'); ?>
-                        <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" /> 
+                        <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
                         <div class='metabox-holder' style='width:49%;float:left;'>
                         <div id="blogedit_bloginfo" class="postbox " >
@@ -89 +89 @@
                                 <table class="form-table">
                                                         <tr class="form-field form-required">
-                                                                <th scope="row"><?php _e('Domain') ?></th> 
+                                                                <th scope="row"><?php _e('Domain') ?></th>
                                                                 <td>http://<input name="blog[domain]" type="text" id="domain" value="<?php echo $details['domain'] ?>" size="33" /></td>
-                                                        </tr> 
+                                                        </tr>
                                                         <tr class="form-field form-required">
-                                                                <th scope="row"><?php _e('Path') ?></th> 
+                                                                <th scope="row"><?php _e('Path') ?></th>
                                                                 <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr($details['path']) ?>" size="40" style='margin-bottom:5px;' />
                                                                 <br /><input type='checkbox' style='width:20px;' name='update_home_url' value='update' <?php if( get_blog_option( $id, 'siteurl' ) == preg_replace('|/+$|', '', 'http://' . $details['domain'] . $details['path']) || get_blog_option( $id, 'home' ) == preg_replace('|/+$|', '', 'http://' . $details['domain'] . $details['path']) ) echo 'checked="checked"'; ?> /> <?php _e( "Update 'siteurl' and 'home' as well." ); ?></td>
-                                                        </tr> 
+                                                        </tr>
                                                         <tr class="form-field">
-                                                                <th scope="row"><?php _e('Registered') ?></th> 
-                                                                <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr($details['registered']) ?>" size="40" /></td> 
-                                                        </tr> 
+                                                                <th scope="row"><?php _e('Registered') ?></th>
+                                                                <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr($details['registered']) ?>" size="40" /></td>
+                                                        </tr>
                                                         <tr class="form-field">
-                                                                <th scope="row"><?php _e('Last Updated') ?></th> 
-                                                                <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr($details['last_updated']) ?>" size="40" /></td> 
-                                                        </tr> 
+                                                                <th scope="row"><?php _e('Last Updated') ?></th>
+                                                                <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr($details['last_updated']) ?>" size="40" /></td>
+                                                        </tr>
                                                         <tr class="form-field">
-                                                                <th scope="row"><?php _e('Public') ?></th> 
+                                                                <th scope="row"><?php _e('Public') ?></th>
                                                                 <td>
                                                                         <input type='radio' style='width:20px;' name='blog[public]' value='1' <?php if( $details['public'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
                                                                         <input type='radio' style='width:20px;' name='blog[public]' value='0' <?php if( $details['public'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-                                                                </td> 
-                                                        </tr> 
+                                                                </td>
+                                                        </tr>
                                                         <tr class="form-field">
-                                                                <th scope="row"><?php _e( 'Archived' ); ?></th> 
+                                                                <th scope="row"><?php _e( 'Archived' ); ?></th>
                                                                 <td>
                                                                         <input type='radio' style='width:20px;' name='blog[archived]' value='1' <?php if( $details['archived'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
                                                                         <input type='radio' style='width:20px;' name='blog[archived]' value='0' <?php if( $details['archived'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-                                                                </td> 
-                                                        </tr> 
+                                                                </td>
+                                                        </tr>
                                                         <tr class="form-field">
-                                                                <th scope="row"><?php _e( 'Mature' ); ?></th> 
+                                                                <th scope="row"><?php _e( 'Mature' ); ?></th>
                                                                 <td>
                                                                         <input type='radio' style='width:20px;' name='blog[mature]' value='1' <?php if( $details['mature'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
                                                                         <input type='radio' style='width:20px;' name='blog[mature]' value='0' <?php if( $details['mature'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-                                                                </td> 
-                                                        </tr> 
+                                                                </td>
+                                                        </tr>
                                                         <tr class="form-field">
-                                                                <th scope="row"><?php _e( 'Spam' ); ?></th> 
+                                                                <th scope="row"><?php _e( 'Spam' ); ?></th>
                                                                 <td>
                                                                         <input type='radio' style='width:20px;' name='blog[spam]' value='1' <?php if( $details['spam'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
                                                                         <input type='radio' style='width:20px;' name='blog[spam]' value='0' <?php if( $details['spam'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-                                                                </td> 
-                                                        </tr> 
+                                                                </td>
+                                                        </tr>
                                                         <tr class="form-field">
-                                                                <th scope="row"><?php _e( 'Deleted' ); ?></th> 
+                                                                <th scope="row"><?php _e( 'Deleted' ); ?></th>
                                                                 <td>
                                                                         <input type='radio' style='width:20px;' name='blog[deleted]' value='1' <?php if( $details['deleted'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
                                                                         <input type='radio' style='width:20px;' name='blog[deleted]' value='0' <?php if( $details['deleted'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-                                                                </td> 
-                                                        </tr> 
+                                                                </td>
+                                                        </tr>
                                                 </table>
                                                 <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
                         </div></div>
-                        
+
                         <div id="blogedit_blogoptions" class="postbox " >
                         <h3 class='hndle'><span><?php printf( __('Blog options (wp_%s_options)'), $id ); ?></span></h3>
@@ -166 +166 @@
                                                                 ?>
                                                                         <tr class="form-field">
-                                                                                <th scope="row"><?php echo ucwords( str_replace( "_", " ", $val['option_name'] ) ) ?></th> 
+                                                                                <th scope="row"><?php echo ucwords( str_replace( "_", " ", $val['option_name'] ) ) ?></th>
                                                                                 <td><textarea rows="5" cols="40" name="option[<?php echo $val['option_name'] ?>]" type="text" id="<?php echo $val['option_name'] ?>"<?php echo $disabled ?>><?php echo wp_specialchars( stripslashes( $val['option_value'] ), 1 ) ?></textarea></td>
                                                                         </tr>
@@ -173 +173 @@
                                                                 ?>
                                                                         <tr class="form-field">
-                                                                                <th scope="row"><?php echo ucwords( str_replace( "_", " ", $val['option_name'] ) ) ?></th> 
-                                                                                <td><input name="option[<?php echo $val['option_name'] ?>]" type="text" id="<?php echo $val['option_name'] ?>" value="<?php echo esc_attr( stripslashes( $val['option_value'] ), 1 ) ?>" size="40" <?php echo $disabled ?> /></td> 
-                                                                        </tr> 
+                                                                                <th scope="row"><?php echo ucwords( str_replace( "_", " ", $val['option_name'] ) ) ?></th>
+                                                                                <td><input name="option[<?php echo $val['option_name'] ?>]" type="text" id="<?php echo $val['option_name'] ?>" value="<?php echo esc_attr( stripslashes( $val['option_value'] ), 1 ) ?>" size="40" <?php echo $disabled ?> /></td>
+                                                                        </tr>
                                                                 <?php
                                                                 }
@@ -184 +184 @@
                         </div></div>
                         </div>
-                        
+
                         <div class='metabox-holder' style='width:49%;float:right;'>
                         <?php
@@ -200 +200 @@
                                                         $checked = ( isset($blog_allowed_themes[ $theme_key ]) ) ? 'checked="checked"' : '';
                                                         $out .= '<tr class="form-field form-required">
-                                                                        <th title="'.htmlspecialchars( $theme["Description"] ).'" scope="row">'.$key.'</th> 
-                                                                        <td><input name="theme['.$theme_key.']" type="checkbox" style="width:20px;" value="on" '.$checked.'/>' . __( 'Active' ) . '</td> 
+                                                                        <th title="'.htmlspecialchars( $theme["Description"] ).'" scope="row">'.$key.'</th>
+                                                                        <td><input name="theme['.$theme_key.']" type="checkbox" style="width:20px;" value="on" '.$checked.'/>' . __( 'Active' ) . '</td>
                                                                 </tr>';
                                                 }
                                         }
-                                        
+
                                         if ( $out != '' ) {
                         ?>
@@ -218 +218 @@
                         </div></div>
                         <?php } ?>
-                        
+
                         <?php
                                         // Blog users
@@ -237 +237 @@
                                                                 ?>
                                                                 <td>
-                                                                        <select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php 
+                                                                        <select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php
                                                                                 foreach( $editblog_roles as $role => $role_assoc ){
                                                                                         $name = translate_with_context($role_assoc['name']);
@@ -261 +261 @@
                                         }
                         ?>
-                        
+
                         <div id="blogedit_blogadduser" class="postbox">
                         <h3 class='hndle'><span><?php _e('Add a new user'); ?></span></h3>
@@ -275 +275 @@
                                                         <td>
                                                                 <select name="new_role" id="new_role">
-                                                                <?php 
+                                                                <?php
                                                                 reset( $editblog_roles );
                                                                 foreach( $editblog_roles as $role => $role_assoc ){
@@ -289 +289 @@
                                 <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
                         </div></div>
-                        
+
                         <div id="blogedit_miscoptions" class="postbox">
                         <h3 class='hndle'><span><?php _e('Misc Blog Actions') ?></span></h3>
@@ -298 +298 @@
                                 <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
                         </div></div>
-                        
+
                         </div>
-                        
+
                         <div style="clear:both;"></div>
                 </form>
@@ -325 +325 @@
                                 AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
                                 AND {$wpdb->registration_log}.IP LIKE ('%{$s}%')";
-                } 
+                }
 
                 if( isset( $_GET['sortby'] ) == false ) {
@@ -408 +408 @@
                         'users'        => __('Users')
                 );
-                
+
                 if( has_filter( 'wpmublogsaction' ) )
                         $posts_columns['plugins'] = __('Actions');
-                        
+
                 $posts_columns = apply_filters('wpmu_blogs_columns', $posts_columns);
 
@@ -428 +428 @@
                                 <?php foreach($posts_columns as $column_id => $column_display_name) {
                                         $column_link = "<a href='ms-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
-                                        if( $_GET['sortby'] == $column_id ) { 
+                                        if( $_GET['sortby'] == $column_id ) {
                                                 $column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;';
                                         }
@@ -444 +444 @@
                                 $bgcolor = $class = '';
                                 $status_list = array( "archived" => "#fee", "spam" => "#faa", "deleted" => "#f55" );
-                                foreach ($blog_list as $blog) { 
+                                foreach ($blog_list as $blog) {
                                         $class = ('alternate' == $class) ? '' : 'alternate';
                                         reset( $status_list );
@@ -456 +456 @@
                                         echo "<tr $bgcolour class='$class'>";
 
-                                        $blogname = ( constant( "VHOST" ) == 'yes' ) ? str_replace('.'.$current_site->domain, '', $blog['domain']) : $blog['path']; 
+                                        $blogname = ( constant( "VHOST" ) == 'yes' ) ? str_replace('.'.$current_site->domain, '', $blog['domain']) : $blog['path'];
                                         foreach( $posts_columns as $column_name=>$column_display_name ) {
                                                 switch($column_name) {
@@ -468 +468 @@
                                                         <?php
                                                         break;
- 
+
                                                         case 'blogname': ?>
                                                                 <td valign="top">
@@ -477 +477 @@
                                                                         $controlActions[]       = '<a href="ms-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
                                                                         $controlActions[]       = "<a href='{$protocol}{$blog['domain']}{$blog['path']}wp-admin/' class='edit'>" . __('Backend') . '</a>';
-                                                                        
+
                                                                         if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
                                                                                 $controlActions[]       = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) . '">' . __('Activate') . '</a>';
                                                                         else
                                                                                 $controlActions[]       = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>';
-                                                                        
+
                                                                         if( get_blog_status( $blog['blog_id'], "archived" ) == '1' )
                                                                                 $controlActions[]       = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>';
                                                                         else
                                                                                 $controlActions[]       = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) . '">' . __('Archive') . '</a>';
-                                                                        
+
                                                                         if( get_blog_status( $blog['blog_id'], "spam" ) == '1' )
                                                                                 $controlActions[]       = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>';
                                                                         else
                                                                                 $controlActions[]       = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>';
-                                                                        
+
                                                                         $controlActions[]       = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) . '">' . __("Delete") . '</a>';
-                                                                        
+
                                                                         $controlActions[]       = "<a href='http://{$blog['domain']}{$blog['path']}' rel='permalink'>" . __('Visit') . '</a>';
                                                                         ?>
-                                                                        
+
                                                                         <?php if (count($controlActions)) : ?>
                                                                         <div class="row-actions">
@@ -506 +506 @@
                                                         <?php
                                                         break;
- 
+
                                                         case 'lastupdated': ?>
                                                                 <td valign="top">
@@ -523 +523 @@
                                                                 <td valign="top">
                                                                         <?php
-                                                                        $blogusers = get_users_of_blog( $blog['blog_id'] ); 
+                                                                        $blogusers = get_users_of_blog( $blog['blog_id'] );
                                                                         if ( is_array( $blogusers ) ) {
                                                                                 $blogusers_warning = '';
@@ -531 +531 @@
                                                                                 }
                                                                                 foreach ( $blogusers as $key => $val ) {
-                                                                                        echo '<a href="user-edit.php?user_id=' . $val->user_id . '">' . $val->user_login . '</a> ('.$val->user_email.')<br />'; 
+                                                                                        echo '<a href="user-edit.php?user_id=' . $val->user_id . '">' . $val->user_login . '</a> ('.$val->user_email.')<br />';
                                                                                 }
                                                                                 if( $blogusers_warning != '' ) {
@@ -549 +549 @@
                                                                 <?php } ?>
                                                         <?php break;
- 
+
                                                         default: ?>
                                                                 <?php if( has_filter( 'manage_blogs_custom_column' ) ) { ?>
@@ -564 +564 @@
                                 }
                         } else { ?>
-                                <tr style='background-color: <?php echo $bgcolor; ?>'> 
-                                        <td colspan="8"><?php _e('No blogs found.') ?></td> 
-                                </tr> 
+                                <tr style='background-color: <?php echo $bgcolor; ?>'>
+                                        <td colspan="8"><?php _e('No blogs found.') ?></td>
+                                </tr>
                         <?php
                         } // end if ($blogs)
@@ -586 +586 @@
                                                 <td>
                                                 <?php if ( constant( "VHOST" ) == 'yes' ) { ?>
-                                                        <input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?> 
+                                                        <input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?>
                                                 <?php } else {
                                                         echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>
-                                                <?php } 
+                                                <?php }
                                                 echo "<p>" . __( 'Only the characters a-z and 0-9 recommended.' ) . "</p>";
                                                 ?>

trunk/wp-admin/ms-upgrade-site.php

@@ -38 +38 @@
                                         }
                                         do_action( 'after_mu_upgrade', $response );
-                                        do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] ); 
+                                        do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
                                 }
                         }
@@ -55 +55 @@
                 }
         break;
-        default: 
+        default:
                 ?><p><?php _e("You can upgrade all the blogs on your site through this page. It works by calling the upgrade script of each blog automatically. Hit the link below to upgrade."); ?></p>
                 <p><a class="button" href="ms-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php

trunk/wp-admin/ms-users.php

@@ -27 +27 @@
                                 _e('Users marked as spam !');
                         break;
-                        case 'all_notspam': 
-                                _e('Users marked as not spam !'); 
-                        break; 
+                        case 'all_notspam':
+                                _e('Users marked as not spam !');
+                        break;
                         case 'all_delete':
                                 _e('Users deleted !');
@@ -86 +86 @@
         // Pagination
         $user_navigation = paginate_links( array(
-                'total' => ceil($total / $num), 
+                'total' => ceil($total / $num),
                 'current' => $apage,
                 'base' => add_query_arg( 'apage', '%#%' ),
                 'format' => ''
         ));
-        
+
         if ( $user_navigation ) {
                 $user_navigation = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
@@ -100 +100 @@
                 );
         }
-        
+
         ?>
         <div class="wrap">
@@ -158 +158 @@
                         <?php if ($user_list) {
                                 $bgcolor = '';
-                                foreach ( (array) $user_list as $user) { 
+                                foreach ( (array) $user_list as $user) {
                                         $class = ('alternate' == $class) ? '' : 'alternate';
-                                        
+
                                         $status_list = array( "spam" => "#faa", "deleted" => "#f55" );
-                                        
+
                                         $bgcolour = "";
                                         foreach ( $status_list as $status => $col ) {
@@ -178 +178 @@
                                                         case 'checkbox': ?>
                                                                 <th scope="row" class="check-column"><input type='checkbox' id='user_<?php echo $user['ID'] ?>' name='allusers[]' value='<?php echo esc_attr($user['ID']) ?>' /></th>
-                                                        <?php 
+                                                        <?php
                                                         break;
 
@@ -213 +213 @@
                                                         break;
 
-                                                        case 'blogs': 
+                                                        case 'blogs':
                                                                 $blogs = get_blogs_of_user( $user['ID'], true );
                                                                 ?>
@@ -223 +223 @@
                                                                                         echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
                                                                                         echo ' <small class="row-actions">';
-                                                                                        
+
                                                                                         // Edit
                                                                                         echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
-                                                                                        
+
                                                                                         // View
-                                                                                        echo '<a '; 
+                                                                                        echo '<a ';
                                                                                         if( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
                                                                                                 echo 'style="background-color: #f66" ';
                                                                                         echo 'target="_new" href="http://'.$val->domain . $val->path.'">' . __('View') . '</a>';
-                                                                                        
-                                                                                        echo '</small><br />'; 
+
+                                                                                        echo '</small><br />';
                                                                                 }
                                                                         }
@@ -248 +248 @@
                                         endforeach
                                         ?>
-                                        </tr> 
+                                        </tr>
                                         <?php
                                 }
                         } else {
                         ?>
-                                <tr style='background-color: <?php echo $bgcolor; ?>'> 
-                                        <td colspan="<?php echo (int) count($posts_columns); ?>"><?php _e('No users found.') ?></td> 
-                                </tr> 
+                                <tr style='background-color: <?php echo $bgcolor; ?>'>
+                                        <td colspan="<?php echo (int) count($posts_columns); ?>"><?php _e('No users found.') ?></td>
+                                </tr>
                                 <?php
                         } // end if ($users)
-                        ?> 
+                        ?>
                         </tbody>
                 </table>
-                
+
                 <div class="tablenav">
                         <?php if ( $user_navigation ) echo "<div class='tablenav-pages'>$user_navigation</div>"; ?>

trunk/wp-includes/ms-functions.php

@@ -78 +78 @@
 function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
         global $wpdb;
-        
+
         if( $sitedomain == '' ) {
                 $site_id = $wpdb->siteid;
@@ -188 +188 @@
  *
  * @deprecated Use {@link is_keymaster()}
- * 
+ *
  */
 function is_site_admin( $user_login = '' ) {
@@ -270 +270 @@
 function add_blog_option( $id, $key, $value ) {
         $id = (int) $id;
-        
+
         switch_to_blog($id);
         add_option( $key, $value );
@@ -279 +279 @@
 function delete_blog_option( $id, $key ) {
         $id = (int) $id;
-        
+
         switch_to_blog($id);
         delete_option( $key );
@@ -288 +288 @@
 function update_blog_option( $id, $key, $value, $refresh = true ) {
         $id = (int) $id;
-        
+
         switch_to_blog($id);
         update_option( $key, $value );
@@ -309 +309 @@
         $switched_stack[] = $blog_id;
 
-        /* If we're switching to the same blog id that we're on, 
-        * set the right vars, do the associated actions, but skip 
+        /* If we're switching to the same blog id that we're on,
+        * set the right vars, do the associated actions, but skip
         * the extra unnecessary work */
         if ( $blog_id == $new_blog ) {
@@ -408 +408 @@
         do_action('switch_blog', $blog_id, $prev_blog_id);
 
-        /* If we still have items in the switched stack, consider ourselves still 'switched' */ 
+        /* If we still have items in the switched stack, consider ourselves still 'switched' */
         $switched = ( is_array( $switched_stack ) && count( $switched_stack ) > 0 );
         return true;
@@ -512 +512 @@
         $user_id = (int) $user_id;
         $blog_id = (int) $blog_id;
-        
+
         if( $blog_id == 0 ) {
                 global $wpdb;
                 $blog_id = $wpdb->blogid;
         }
-        
+
         $blogs = get_blogs_of_user( $user_id );
         if( is_array( $blogs ) ) {
@@ -907 +907 @@
 function is_email_address_unsafe( $user_email ) {
         $banned_names = get_site_option( "banned_email_domains" );
-        if ($banned_names && !is_array( $banned_names )) { 
-                $banned_names = explode( "\n", $banned_names); 
-        } 
+        if ($banned_names && !is_array( $banned_names )) {
+                $banned_names = explode( "\n", $banned_names);
+        }
         if ( is_array( $banned_names ) && empty( $banned_names ) == false ) {
                 $email_domain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
@@ -1117 +1117 @@
         $path = $wpdb->escape($path);
         $title = $wpdb->escape($title);
-                                        
+
         $wpdb->insert( $wpdb->signups, array(
-                'domain' => $domain, 
-                'path' => $path, 
+                'domain' => $domain,
+                'path' => $path,
                 'title' => $title,
-                'user_login' => $user, 
-                'user_email' => $user_email, 
+                'user_login' => $user,
+                'user_email' => $user_email,
                 'registered' => current_time('mysql', true),
-                'activation_key' => $key, 
+                'activation_key' => $key,
                 'meta' => $meta
         ) );
@@ -1140 +1140 @@
         $key = substr( md5( time() . rand() . $user_email ), 0, 16 );
         $meta = serialize($meta);
-                                        
+
         $wpdb->insert( $wpdb->signups, array(
-                'domain' => '', 
-                'path' => '', 
+                'domain' => '',
+                'path' => '',
                 'title' => '',
-                'user_login' => $user, 
-                'user_email' => $user_email, 
+                'user_login' => $user,
+                'user_email' => $user_email,
                 'registered' => current_time('mysql', true),
-                'activation_key' => $key, 
+                'activation_key' => $key,
                 'meta' => $meta
         ) );
@@ -1344 +1344 @@
         if( get_site_option( 'registrationnotification' ) != 'yes' )
                 return false;
-                
+
         $email = get_site_option( 'admin_email' );
         if( is_email($email) == false )
                 return false;
-        
+
         $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
 
@@ -1355 +1355 @@
         $siteurl = get_option( 'siteurl' );
         restore_current_blog();
-        
+
         $msg = sprintf( __( "New Blog: %1s
 URL: %2s
@@ -1362 +1362 @@
 Disable these notifications: %4s"), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
         $msg = apply_filters( 'newblog_notify_siteadmin', $msg );
-        
+
         wp_mail( $email, sprintf( __( "New Blog Registration: %s" ), $siteurl ), $msg );
         return true;
@@ -1371 +1371 @@
         if( get_site_option( 'registrationnotification' ) != 'yes' )
                 return false;
-                
+
         $email = get_site_option( 'admin_email' );
         if( is_email($email) == false )
@@ -1382 +1382 @@
 
 Disable these notifications: %3s"), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url);
-        
+
         $msg = apply_filters( 'newuser_notify_siteadmin', $msg );
         wp_mail( $email, sprintf(__("New User Registration: %s"), $user->user_login), $msg );
@@ -1417 +1417 @@
         require_once( ABSPATH . 'wp-admin/includes/upgrade.php');
 
-        if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") ) 
+        if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") )
                 die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
         $wpdb->suppress_errors( false);
@@ -1445 +1445 @@
         $cat_name = __('Blogroll');
         $cat_slug = sanitize_title($cat_name);
-        
+
         $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
         if( $blogroll_id == null ) {
@@ -1488 +1488 @@
         $first_post = str_replace( "SITE_NAME", $current_site->site_name, $first_post );
         $wpdb->insert( $wpdb->posts, array(
-                'post_author' => $user_id, 
-                'post_date' => $now, 
+                'post_author' => $user_id,
+                'post_date' => $now,
                 'post_date_gmt' => $now_gmt,
-                'post_content' => stripslashes( $first_post ), 
-                'post_excerpt' => '', 
+                'post_content' => stripslashes( $first_post ),
+                'post_excerpt' => '',
                 'post_title' => __('Hello world!'),
                 'post_name' => __('hello-world'),
@@ -1507 +1507 @@
         // First page
         $wpdb->insert( $wpdb->posts, array(
-                'post_author' => $user_id, 
-                'post_date' => $now, 
+                'post_author' => $user_id,
+                'post_date' => $now,
                 'post_date_gmt' => $now_gmt,
                 'post_content' => get_site_option( 'first_page' ),
-                'post_excerpt' => '', 
+                'post_excerpt' => '',
                 'post_title' => __('About'),
                 'post_name' => __('about'),
@@ -1522 +1522 @@
                 'post_content_filtered' => ''
         ) );
-        
+
         // Flush rules to pick up the new page.
         $wp_rewrite->init();
@@ -1529 +1529 @@
         // Default comment
         $wpdb->insert( $wpdb->comments, array(
-                'comment_post_ID' => '1', 
+                'comment_post_ID' => '1',
                 'comment_author' => __( get_site_option( 'first_comment_author' ) ),
                 'comment_author_email' => '',
                 'comment_author_url' => get_site_option( 'first_comment_url' ),
-                'comment_author_IP' => '127.0.0.1', 
+                'comment_author_IP' => '127.0.0.1',
                 'comment_date' => $now,
-                'comment_date_gmt' => $now_gmt, 
+                'comment_date_gmt' => $now_gmt,
                 'comment_content' => __( get_site_option( 'first_comment' ) )
         ) );
-        
+
         $user = new WP_User($user_id);
         $wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
@@ -1545 +1545 @@
         $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level') );
         $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
-        
+
         // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
         if ( !is_site_admin( $user->user_login ) && $user_id != 1 )
@@ -1606 +1606 @@
                 return false;
 
-        $welcome_email = get_site_option( 'welcome_user_email' ); 
+        $welcome_email = get_site_option( 'welcome_user_email' );
 
         $user = new WP_User($user_id);
@@ -1747 +1747 @@
         $spaceAllowed = get_space_allowed();
         if(empty($spaceAllowed) || !is_numeric($spaceAllowed))
-                $spaceAllowed = 10;     // Default space allowed is 10 MB 
-        
+                $spaceAllowed = 10;     // Default space allowed is 10 MB
+
         $dirName = BLOGUPLOADDIR;
         $size = get_dirsize($dirName) / 1024 / 1024;
-        
-        if( ($spaceAllowed-$size) < 0 ) { 
+
+        if( ($spaceAllowed-$size) < 0 ) {
                 if( $echo )
                         _e( "Sorry, you have used your space allocation. Please delete some files to upload more files." ); //No space left
@@ -1788 +1788 @@
                 return 0;
         }
-        
+
         $spaceAllowed = 1024 * 1024 * get_space_allowed();
         $dirName = BLOGUPLOADDIR;
@@ -1802 +1802 @@
 function graceful_fail( $message ) {
         $message = apply_filters('graceful_fail', $message);
-        $message_template = apply_filters( 'graceful_fail_template', 
+        $message_template = apply_filters( 'graceful_fail_template',
 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head profile="http://gmpg.org/xfn/11">
@@ -1844 +1844 @@
 
                 if( $this->reallydeleteblog == true ) {
-                        wpmu_delete_blog( $wpdb->blogid ); 
+                        wpmu_delete_blog( $wpdb->blogid );
                 }
         }
@@ -1863 +1863 @@
                         $url_delete = get_option( "siteurl" ) . "/wp-admin/options-general.php?page=delete-blog&h=" . $hash;
                         $msg = __("Dear User,
-You recently clicked the 'Delete Blog' link on your blog and filled in a 
+You recently clicked the 'Delete Blog' link on your blog and filled in a
 form on that page.
 If you really want to delete your blog, click the link below. You will not
@@ -1870 +1870 @@
 
 If you delete your blog, please consider opening a new blog here
-some time in the future! (But remember your current blog and username 
+some time in the future! (But remember your current blog and username
 are gone forever.)
 
@@ -1933 +1933 @@
         clean_term_cache($term_id);
 
-        return $global_id; 
-}   
+        return $global_id;
+}
 
 function redirect_this_site( $deprecated = '' ) {
@@ -1945 +1945 @@
                 return $upload;
         if( strlen( $upload[ 'bits' ] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
-                return sprintf(__( "This file is too big. Files must be less than %dKb in size.<br />" ), get_site_option( 'fileupload_maxk', 1500 )); 
+                return sprintf(__( "This file is too big. Files must be less than %dKb in size.<br />" ), get_site_option( 'fileupload_maxk', 1500 ));
         }
 
@@ -2113 +2113 @@
 }
 
-/* Short circuit the update checks. Make sure update informtion is 
+/* Short circuit the update checks. Make sure update informtion is
    stored in wp_sitemeta rather than the options table of individual blogs */
 
@@ -2198 +2198 @@
 
         $dashboard_blog = get_dashboard_blog();
-        if ( $current_blog->blog_id == $dashboard_blog->blog_id && $dashboard_blog->blog_id != $current_site->blog_id ) { 
-                $protocol = ( is_ssl() ? 'https://' : 'http://' ); 
+        if ( $current_blog->blog_id == $dashboard_blog->blog_id && $dashboard_blog->blog_id != $current_site->blog_id ) {
+                $protocol = ( is_ssl() ? 'https://' : 'http://' );
                 wp_redirect( $protocol . $dashboard_blog->domain . trailingslashit( $dashboard_blog->path ) . 'wp-admin/' );
                 die();
@@ -2223 +2223 @@
         if( $blog_id == 0 )
                 $blog_id = $wpdb->blogid;
-        
+
         $local_key = $wpdb->base_prefix . $blog_id . "_" . $key;
         if( isset( $current_user->$local_key ) )
@@ -2347 +2347 @@
         if ( !$active_sitewide_plugins )
                 return $active_plugins;
-        
+
         $plugins = array_merge( (array) $active_plugins, array_keys( (array) $active_sitewide_plugins ) );
         sort( $plugins );

trunk/wp-includes/ms-settings.php

@@ -54 +54 @@
         if( $current_site )
                 return $current_site;
-                
+
         $wpdb->suppress_errors();
         $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site