Changeset 5656

Timestamp:

01/27/2012 09:15:28 PM (13 years ago)

Author:

boonebgorges

Message:

Reconfigures require() order for loading process during installation and upgrade.
Corrects outdated function calls and path names in installation wizard.
See #3740.
Fixes #3875. Fixes #3802. See #3865.

Location:

trunk

Files:

• bp-core/admin/bp-core-update.php (modified) (1 diff)
• bp-core/bp-core-admin.php (modified) (1 diff)
• bp-loader.php (modified) (3 diffs)

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

@@ -1155 +1155 @@
 
             // Load BP and hook the admin menu, so that the redirect is successful
-            if ( !function_exists( 'bp_core_update_message' ) )
-                require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-admin.php' );
-
-            bp_core_add_admin_menu();
+            require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-admin.php' );
+            bp_admin();
 
             // Redirect to the BuddyPress dashboard

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

@@ -131 +131 @@
 
         // Include the files
-        require( $this->admin_dir . 'bp-core-settings.php'   );
-        require( $this->admin_dir . 'bp-core-functions.php'  );
-        require( $this->admin_dir . 'bp-core-components.php' );
-        require( $this->admin_dir . 'bp-core-slugs.php'      );
+        require_once( $this->admin_dir . 'bp-core-settings.php'   );
+        require_once( $this->admin_dir . 'bp-core-functions.php'  );
+        require_once( $this->admin_dir . 'bp-core-components.php' );
+        require_once( $this->admin_dir . 'bp-core-slugs.php'      );
         //require( $this->admin_dir . 'bp-metaboxes.php'       );
     }

trunk/bp-loader.php

@@ -447 +447 @@
             $this->is_network_activate = true;
 
-        // Require all of the BuddyPress core libraries
-        require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
-        require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
-        require( $this->plugin_dir . 'bp-core/bp-core-hooks.php'      );
-        require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
-        require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
-        require( $this->plugin_dir . 'bp-core/bp-core-options.php'    );
-        require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
-        require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
-        require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
-        require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
-        require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
-        require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
-        require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
-        require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
-        require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
-        require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
-        require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
-        require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
-
-        // Skip or load deprecated content
-        if ( false !== $this->load_deprecated ) {
-            require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
-            require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
-        }
-
         /** Update/Install ****************************************************/
 
@@ -478 +452 @@
         if ( empty( $this->db_version_raw ) ) {
             $this->maintenance_mode = 'install';
+            
+            // 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' );
 
@@ -485 +465 @@
             // Setup the BuddyPress theme directory
             register_theme_directory( $this->themes_dir );
+            
+            // Require all of the BuddyPress core libraries
+            require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
+            require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
+            require( $this->plugin_dir . 'bp-core/bp-core-hooks.php'      );
+            require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
+            require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
+            require( $this->plugin_dir . 'bp-core/bp-core-options.php'    );
+            require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
+            require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
+            require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
+            require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
+            require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
+            require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
+            require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
+            require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
+            require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
+            require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
+            require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
+            require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
+    
+            // Skip or load deprecated content
+            if ( false !== $this->load_deprecated ) {
+                require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
+                require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
+            }
 
             // Check if an update is required