Changeset 5749 for trunk/bp-loader.php

Timestamp:

02/13/2012 04:03:55 AM (13 years ago)

Author:

johnjamesjacoby

Message:

First pass at refactoring update/install wizard to remove code duplication:

• Rename and move admin images, css, and js into bp-core/admin/ folders
• Load the wizard from inside BP_Admin instead of selectively alone, so that basic functions are available
• Properly enqueue admin scripts
• Remove duplicated _update_ functions in bp-core-updater.php
• Remove weird redirect hack as it's no longer needed
• Remove purpose built functions that are no longer needed
• See #4005.
• Indirectly fixes #3964.

File:

• trunk/bp-loader.php (modified) (2 diffs)

trunk/bp-loader.php

@@ -315 +315 @@
      * @uses plugin_dir_url()
      */
-    public function constants() {
+    private function constants() {
 
         // Define the BuddyPress version
@@ -475 +475 @@
             // The installation process requires a few BuddyPress core libraries
             if ( !empty( $this->maintenance_mode ) ) {
-                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/bp-core-options.php'      );
-                require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
+                require( $this->plugin_dir . 'bp-core/bp-core-admin.php'     );
+                require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
+                require( $this->plugin_dir . 'bp-core/bp-core-template.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/bp-core-options.php'   );
+
+                // Load up BuddyPress's admin
+                add_action( 'plugins_loaded', 'bp_admin' );
             }
         }