Changeset 5749 for trunk/bp-core/admin/bp-core-components.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-core/admin/bp-core-components.php (modified) (3 diffs)

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

@@ -52 +52 @@
  */
 function bp_core_admin_components_options() {
-    global $bp_wizard;
 
     // Load core functions, if needed
@@ -131 +130 @@
 
     // On new install, set all components to be active by default
-    if ( !empty( $bp_wizard ) && 'install' == $bp_wizard->setup_type && empty( $active_components ) )
+    if ( empty( $active_components ) && ( bp_get_maintenance_mode() == 'install' ) )
         $active_components = $optional_components;
 
-    ?>
-
-    <?php /* The setup wizard uses different, more descriptive text here */ ?>
-    <?php if ( empty( $bp_wizard ) ) : ?>
+    // The setup wizard uses different, more descriptive text
+    if ( bp_get_maintenance_mode() ) : ?>
 
         <h3><?php _e( 'Available Components', 'buddypress' ); ?></h3>
@@ -169 +166 @@
     </table>
 
-    <?php if ( empty( $bp_wizard ) ) : ?>
+    <?php if ( bp_get_maintenance_mode() ) : ?>
 
         <h3><?php _e( 'Required Components', 'buddypress' ); ?></h3>