Changeset 5659

Timestamp:

01/27/2012 09:31:43 PM (13 years ago)

Author:

boonebgorges

Message:

Fixes PHP errors during installation process.
Ensures that bp_is_active() exists before redirecting upon the last step of the installation wizard.
Bails from bp_core_record_activity() when an update is in progress.
Fixes #3682.

Location:

trunk/bp-core

Files:

• admin/bp-core-update.php (modified) (1 diff)
• bp-core-functions.php (modified) (1 diff)

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

@@ -1156 +1156 @@
             // Load BP and hook the admin menu, so that the redirect is successful
             require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-admin.php' );
+            require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-template.php' );
             bp_admin();
 

trunk/bp-core/bp-core-functions.php

@@ -497 +497 @@
 
     if ( !is_user_logged_in() )
+        return false;
+        
+    if ( bp_is_update() )
         return false;