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

Timestamp:

02/13/2012 05:04:53 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Bump default DB version in bp-core-options.php. Use bp_bump_version() where needed. Update activation/deactivation hooks, and prevent activation error from function not existing. Fixes #3967.

File:

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

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

@@ -1 +1 @@
 <?php
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -19 +20 @@
 
     function __construct() {
-
-        // Ensure that we have access to some utility functions. Must use require_once()
-        // because BP Core is loaded during incremental upgrades
-        require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
 
         // Set/reset the wizard cookie
@@ -55 +52 @@
         $steps = array();
 
+        // This is a first time installation
         if ( bp_get_maintenance_mode() == 'install' ) {
             $steps = array(
@@ -64 +62 @@
             );
 
-        // Update wizard steps
+        // This is an update to an existing install
         } else {
 
-            if ( bp_get_db_version_raw() < (int) bp_get_db_version() )
+            if ( bp_get_db_version_raw() < (int) bp_get_db_version() ) {
                 $steps[] = __( 'Database Update', 'buddypress' );
+            }
 
             // New for BP 1.5
@@ -77 +76 @@
 
             // New for BP 1.6
-            if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
+            if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) ) {
                 $steps[] = __( 'Admin Bar', 'buddypress' );
+            }
 
             $steps[] = __( 'Finish', 'buddypress' );
@@ -962 +962 @@
 
             // Update the DB version in the database
-            // Stored in sitemeta. Do not use bp_update_option()
-            update_blog_option( bp_get_root_blog_id(), '_bp_db_version', bp_get_db_version() );
+            bp_version_bump();
 
             // Delete the setup cookie