Changeset 4794 for trunk/bp-core/admin/bp-core-admin.php

Timestamp:

07/22/2011 01:45:08 PM (14 years ago)

Author:

boonebgorges

Message:

Cleans up require()s in BP installation process. Fixes #3369. See #3367

File:

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

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

@@ -329 +329 @@
 function bp_core_admin_component_options() {
     global $bp_wizard;
-            
-    require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
+    
+    // Load core functions, if needed
+    if ( !function_exists( 'bp_get_option' ) )
+        require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
 
     $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );