Changeset 5721 for trunk/bp-loader.php

Timestamp:

02/11/2012 08:10:10 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Tweak the BuddyPress installation and update wizard:

• Rename new 'bp-force-buddybar' option to '_bp_force_buddybar' to fit naming scheme
• Remove single-site to multi-site wizard step, since the page-nag will take care of this
• Remove any previous db versions when updating
• Use bp_get_option() in bp-core-options.php

File:

• trunk/bp-loader.php (modified) (3 diffs)

trunk/bp-loader.php

@@ -68 +68 @@
      * @var string State of BuddyPress installation
      */
-    public $maintenance_mode = '';
+    public $maintenance_mode = false;
 
     /**
@@ -439 +439 @@
         require( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
 
-        // Get the possible DB versions
+        // Get the possible DB versions (boy is this gross)
         $versions               = array();
-        $versions['1.2']        = get_site_option(                      'bp-core-db-version' );
-        $versions['1.5-multi']  = get_site_option(                           'bp-db-version' );
-        $versions['1.6-multi']  = get_site_option(                          '_bp_db_version' );
-        $versions['1.5-single'] = get_blog_option( $this->root_blog_id,     'bp-db-version'  );
-        $versions['1.6-single'] = get_blog_option( $this->root_blog_id,     '_bp_db_version' );
-
-        // Remove empty array items
-        $versions = array_filter( $versions );
+        $versions['1.6-single'] = get_blog_option( $this->root_blog_id, '_bp_db_version' );
+
+        // 1.6-single exists, so trust it
+        if ( !empty( $versions['1.6-single'] ) ) {
+            $this->db_version_raw = (int) $versions['1.6-single'];
 
         // If no 1.6-single exists, use the max of the others
-        if ( empty( $versions['1.6-single'] ) )
-            $this->db_version_raw = !empty( $versions ) ? (int) max( $versions ) : 0;
-
-        // 1.6-single exists, so trust it
-        else
-            $this->db_version_raw = $versions['1.6-single'];
-
-        // Is this an upgrade to WordPress Network Mode?
-        // We know by checking to see whether the db version is saved in sitemeta
-        if ( is_multisite() && ( empty( $versions['1.5-multi'] ) && empty( $versions['1.6-multi'] ) ) )
-            $this->is_network_activate = true;
+        } else {
+            $versions['1.2']        = get_site_option(                      'bp-core-db-version' );
+            $versions['1.5-multi']  = get_site_option(                           'bp-db-version' );
+            $versions['1.6-multi']  = get_site_option(                          '_bp_db_version' );
+            $versions['1.5-single'] = get_blog_option( $this->root_blog_id,     'bp-db-version'  );
+
+            // Remove empty array items
+            $versions             = array_filter( $versions );
+            $this->db_version_raw = (int) ( !empty( $versions ) ) ? (int) max( $versions ) : 0;
+        }
 
         /** Update/Install ****************************************************/
 
         // This is a new installation
-        if ( empty( $this->db_version_raw ) ) {
-            $this->maintenance_mode = 'install';
-            
+        if ( is_admin() ) {
+
+            // New installation
+            if ( empty( $this->db_version_raw ) ) {
+                $this->maintenance_mode = 'install';
+
+            // Update
+            } elseif ( (int) $this->db_version_raw < (int) $this->db_version ) {
+                $this->maintenance_mode = 'update';
+            }
+
             // The installation process requires a few BuddyPress core libraries
-            require( $this->plugin_dir . 'bp-core/bp-core-functions.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-update.php'       );
-            require( $this->plugin_dir . 'bp-core/bp-core-caps.php'         );
-            
-            require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
-
-        // There is a previous installation
-        } else {
+            if ( !empty( $this->maintenance_mode ) ) {
+                require( $this->plugin_dir . 'bp-core/bp-core-functions.php'    );
+                require( $this->plugin_dir . 'bp-core/bp-core-update.php'       );
+                require( $this->plugin_dir . 'bp-core/bp-core-caps.php'         );
+                require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
+            }
+        }
+
+        // Not in maintenance made
+        if ( empty( $this->maintenance_mode ) ) {
 
             // Setup the BuddyPress theme directory
@@ -507 +513 @@
                 require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
             }
-
-            // Check if an update is required
-            if ( ( (int) $this->db_version_raw < (int) $this->db_version ) || ( !empty( $this->is_network_activate ) ) ) {
-
-                // BuddyPress needs an update
-                $this->maintenance_mode = 'update';
-
-                // Only include core updater if in the admin area
-                if ( is_admin() ) {
-                    require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
-                }
-            }
         }       
     }