Changeset 5309 for trunk/bp-core/admin/bp-core-update.php

Timestamp:

11/08/2011 08:39:23 PM (13 years ago)

Author:

johnjamesjacoby

Message:

bp-loader.php is a real boy! Introduce BuddyPress class to handle the loading of BuddyPress core and provide declarations to the $bp global variables. Ports several functions and methods from bbPress 2.0 into bp-core-update.php to manage the hand-off into the update routine. See #3739.

File:

• trunk/bp-core/admin/bp-core-update.php (modified) (10 diffs)

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

@@ -4 +4 @@
 
 class BP_Core_Setup_Wizard {
+
+    /**
+     * @var int The current step of the updater
+     */
     var $current_step;
+
+    /**
+     *
+     * @var array The total steps to be completed
+     */
     var $steps;
 
-    var $database_version;
+    /**
+     * @var int Database version of current BuddyPress files
+     */
+    var $db_version;
+
+    /**
+     * @var int Database version raw from the database connection
+     */
+    var $db_version_raw;
+
+    /**
+     * @var int Are we currently network activated
+     */
     var $is_network_activate;
-    var $new_version;
+
+    /**
+     * @var string What kind of setup/update are we performing
+     */
     var $setup_type;
+
+    /** Functions *************************************************************/
 
     function bp_core_setup_wizard() {
@@ -24 +50 @@
 
         // Get current DB version
-        $this->database_version = !empty( $bp->database_version ) ? (int) $bp->database_version : 0;
+        $this->db_version_raw = !empty( $bp->db_version_raw ) ? (int) $bp->db_version_raw : 0;
 
         if ( !empty( $bp->is_network_activate ) ) {
@@ -34 +60 @@
         }
 
-        $this->new_version  = constant( 'BP_DB_VERSION' );
+        $this->db_version   = bp_get_db_version();
         $this->setup_type   = !empty( $bp->maintenance_mode ) ? $bp->maintenance_mode : '';
         $this->current_step = $this->current_step();
@@ -82 +108 @@
                 $steps[] = __( 'Multisite Update', 'buddypress' );
 
-            if ( $this->database_version < (int) $this->new_version )
+            if ( $this->db_version_raw < (int) $this->db_version )
                 $steps[] = __( 'Database Update', 'buddypress' );
 
             // New for BP 1.5
-            if ( $this->database_version < 1801 || !bp_core_get_directory_page_ids() ) {
+            if ( $this->db_version_raw < 1801 || !bp_core_get_directory_page_ids() ) {
                 $steps[] = __( 'Components', 'buddypress' );
                 $steps[] = __( 'Pages', 'buddypress' );
@@ -92 +118 @@
 
             // New for BP 1.6
-            if ( $this->database_version < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
+            if ( $this->db_version_raw < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
                 $steps[] = __( 'Admin Bar', 'buddypress' );
 
@@ -805 +831 @@
             bp_core_install();
 
-            if ( $this->database_version < 1801 )
+            if ( $this->db_version_raw < 1801 )
                 $this->update_1_5();
 
@@ -829 +855 @@
             // Transfer important settings from blog options to site options
             $options = array(
-                'bp-db-version'        => $this->database_version,
+                '_bp_db_version'       => $this->db_version,
                 'bp-active-components' => $active_components,
                 'avatar-default'       => get_option( 'avatar-default' )
@@ -844 +870 @@
                 // Move bp-pages data from the blog options table to site options
                 $existing_pages = bp_get_option( 'bp-pages' );
-
                 $bp_pages       = $this->setup_pages( (array)$_POST['bp_pages'] );
                 $bp_pages       = array_merge( (array)$existing_pages, (array)$bp_pages );
@@ -856 +881 @@
             }
 
+            // Delete the old site option
+            delete_site_option( 'bp-db-version' );
+
+            // Update the active components
             bp_update_option( 'bp-active-components', $active_components );
 
@@ -1092 +1121 @@
             // Update the DB version in the database
             // Stored in sitemeta. Do not use bp_update_option()
-            update_site_option( 'bp-db-version', $this->new_version );
+            update_site_option( 'bp-db-version', $this->db_version );
             delete_site_option( 'bp-core-db-version' );