Changeset 4794

Timestamp:

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

Author:

boonebgorges

Message:

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

Location:

trunk/bp-core/admin

Files:

• bp-core-admin.php (modified) (1 diff)
• bp-core-schema.php (modified) (1 diff)
• bp-core-update.php (modified) (4 diffs)

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' ) );

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

@@ -1 +1 @@
 <?php
-require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
- 
+
 function bp_core_set_charset() {
         global $wpdb;
 
-        require( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
         /* BuddyPress component DB schema */

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

@@ -17 +17 @@
                 global $bp;
 
-                // Ensure that we have access to some utility functions
-                require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
+                // 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' );
 
                 // Get current DB version
@@ -585 +586 @@
                         return false;
 
-                require( ABSPATH . WPINC . '/plugin.php' );
                 $installed_plugins = get_plugins();
                 $installed_themes  = get_themes();
@@ -1019 +1019 @@
 
                         // Load BP and hook the admin menu, so that the redirect is successful
-                        require( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
                         require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-admin.php' );
                         bp_core_add_admin_menu();
@@ -1261 +1260 @@
  * @return array $page_ids
  */
-function bp_core_update_get_page_meta() {                       
-        require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
-        
+function bp_core_update_get_page_meta() {
         if ( !$page_ids = bp_get_option( 'bp-pages' ) )
                 $page_ids = array();