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

Timestamp:

09/19/2012 06:52:23 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Wizard:

• Remove theme selection; theme compat negates this.
• Fix $bp_pages issues with wizard when using existing pages.
• Bail early if not correct $_POST conditions rather than huge wrapping if () statements.
• Remove find.png theme image.
• Use buddypress() function in place of global $bp in changed files.
• Bump DB version.

File:

• trunk/bp-core/bp-core-admin.php (modified) (6 diffs)

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

@@ -83 +83 @@
      */
     private function setup_globals() {
-        global $bp;
-
-        // Admin url
-        $this->admin_dir  = trailingslashit( $bp->plugin_dir . 'bp-core/admin' );
-
-        // Admin url
-        $this->admin_url  = trailingslashit( $bp->plugin_url . 'bp-core/admin' );
-
-        // Admin images URL
-        $this->images_url = trailingslashit( $this->admin_url . 'images' );
-
-        // Admin css URL
-        $this->css_url    = trailingslashit( $this->admin_url . 'css'    );
-
-        // Admin css URL
-        $this->js_url     = trailingslashit( $this->admin_url . 'js'     );
+        $bp               = buddypress();
+        $this->admin_dir  = trailingslashit( $bp->plugin_dir  . 'bp-core/admin' ); // Admin path
+        $this->admin_url  = trailingslashit( $bp->plugin_url  . 'bp-core/admin' ); // Admin url
+        $this->images_url = trailingslashit( $this->admin_url . 'images'        ); // Admin images URL
+        $this->css_url    = trailingslashit( $this->admin_url . 'css'           ); // Admin css URL
+        $this->js_url     = trailingslashit( $this->admin_url . 'js'            ); // Admin css URL
     }
 
@@ -150 +140 @@
         add_action( bp_core_admin_hook(),    array( $this, 'admin_menus' ), 5 );
 
-        // Add notice if not using a BuddyPress theme
+        // Add notice if an update is needed
         add_action( 'admin_notices',         array( $this, 'admin_notices' ) );
         add_action( 'network_admin_notices', array( $this, 'admin_notices' ) );
@@ -186 +176 @@
         if ( bp_get_maintenance_mode() ) {
 
-            if ( !current_user_can( 'manage_options' ) )
+            if ( !current_user_can( 'manage_options' ) ) {
                 return;
-
-            if ( bp_get_maintenance_mode() == 'install' )
+            }
+
+            if ( bp_get_maintenance_mode() == 'install' ) {
                 $status = __( 'BuddyPress Setup', 'buddypress' );
-            else
+            } else {
                 $status = __( 'Update BuddyPress',  'buddypress' );
+            }
 
             if ( bp_get_wizard() ) {
@@ -206 +198 @@
 
             // Bail if user cannot moderate
-            if ( ! bp_current_user_can( 'manage_options' ) )
+            if ( ! bp_current_user_can( 'manage_options' ) ) {
                 return;
+            }
 
             $hooks = array();
@@ -477 +470 @@
             // Update text
             case 'update' :
-                $msg = sprintf( __( 'BuddyPress has been updated! Please run the <a href="%s">update wizard</a>.', 'buddypress' ), $url );
+                $msg = sprintf( __( 'BuddyPress has been updated! Please run the <a href="%s">update wizard</a>.', 'buddypress' ), esc_url( $url ) );
                 break;
 
             // First install text
             case 'install' : default :
-                $msg = sprintf( __( 'BuddyPress was successfully activated! Please run the <a href="%s">installation wizard</a>.', 'buddypress' ), $url );
+                $msg = sprintf( __( 'BuddyPress was successfully activated! Please run the <a href="%s">installation wizard</a>.', 'buddypress' ), esc_url( $url ) );
                 break;
         } ?>
@@ -501 +494 @@
  */
 function bp_admin() {
-    global $bp;
-
-    $bp->admin = new BP_Admin();
+    buddypress()->admin = new BP_Admin();
 }