Changeset 3592 for trunk/bp-core/admin/bp-core-upgrade.php

Timestamp:

12/27/2010 10:57:31 PM (15 years ago)

Author:

djpaul

Message:

Removes trailing whitespace. Fixes #2965, props cnorris23

File:

• trunk/bp-core/admin/bp-core-upgrade.php (modified) (12 diffs)

trunk/bp-core/admin/bp-core-upgrade.php

@@ -10 +10 @@
 // Install site options on activation
 bp_core_activate_site_options( array( 'bp-disable-account-deletion' => 0, 'bp-disable-avatar-uploads' => 0, 'bp-disable-blogforum-comments' => 0,  'bp-disable-forum-directory' => 0,  'bp-disable-profile-sync' => 0 ) );
- 
+
 /**
  * bp_core_activate_site_options()
@@ -56 +56 @@
             if ( $this->current_version = get_option( 'bp-db-version' ) )
                 $this->is_network_activate = true;
-        
+
         $this->new_version = constant( 'BP_DB_VERSION' );
         $this->setup_type = ( empty( $this->current_version ) && !(int)get_site_option( 'bp-core-db-version' ) ) ? 'new' : 'upgrade';
@@ -104 +104 @@
         } else {
             // Upgrade wizard steps
-            
+
             if ( $this->is_network_activate )
                 $steps[] = __( 'Multisite Upgrade', 'buddypress' );
-            
+
             if ( $this->current_version < $this->new_version )
                 $steps[] = __( 'Database Upgrade', 'buddypress' );
@@ -243 +243 @@
     <?php
     }
-    
+
     function step_ms_upgrade() {
         if ( !current_user_can( 'activate_plugins' ) )
@@ -252 +252 @@
         else
             $blogs_slug = __( 'blogs', 'buddypress' );
-        
+
         if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
             $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
@@ -262 +262 @@
             <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
         </div>
-        
+
         <p><?php printf( __( 'It looks like you have just activated WordPress Multisite mode, which allows members of your BuddyPress community to have their own WordPress blogs. You can enable or disable this feature at any time at <a href="%s">Network Options</a>.', 'buddypress' ), admin_url( 'ms-options.php' ) ); ?></p>
-        
+
         <p><?php _e( "Please select the WordPress page you would like to use to display the blog directory. You can either choose an existing page or let BuddyPress auto-create a page for you. If you'd like to manually create pages, please go ahead and do that now, you can come back to this step once you are finished.", 'buddypress' ) ?></p>
 
@@ -281 +281 @@
                 </td>
             </tr>
-            
+
         </table>
-        
+
         <p><?php _e( 'Would you like to enable blog tracking, which tracks blog activity across your network?', 'buddypress' ); ?></p>
-        
+
         <div class="left-col">
-            
+
             <div class="component">
                 <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5>
@@ -298 +298 @@
                 <img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" />
                     <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
-            </div>      
-        </div>
-        
+            </div>
+        </div>
+
         <div class="submit clear">
             <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
@@ -308 +308 @@
             <?php wp_nonce_field( 'bpwizard_ms_upgrade' ) ?>
         </div>
-        
+
         <script type="text/javascript">
             jQuery('select').click( function() {
@@ -838 +838 @@
                 if ( $current_blog->blog_id != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
                     switch_to_blog( BP_ROOT_BLOG );
-    
+
                 $existing_pages = get_option( 'bp-pages' );
 
                 $bp_pages = $this->setup_pages( (array)$_POST['bp_pages'] );
-                
+
                 $bp_pages = array_merge( (array)$existing_pages, (array)$bp_pages );
-    
+
                 update_option( 'bp-pages', $bp_pages );
 
                 if ( $current_blog->blog_id != BP_ROOT_BLOG )
                     restore_current_blog();
-            
+
                 unset( $disabled['bp-blogs.php'] );
-                
+
                 bp_core_install( $disabled );
             }
-            
+
             update_site_option( 'bp-deactivated-components', $disabled );
 
@@ -1045 +1045 @@
         return false;
     }
-    
+
     function setup_pages( $pages ) {
         foreach ( $pages as $key => $value ) {
@@ -1059 +1059 @@
             }
         }
-        
+
         return $bp_pages;
     }