Changeset 6343 for trunk/bp-core/admin/bp-core-functions.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/admin/bp-core-functions.php (modified) (5 diffs)

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

@@ -131 +131 @@
  * @since BuddyPress (1.5)
  *
- * @global BuddyPress $bp The one true BuddyPress instance
  * @uses bp_current_user_can() to check current user permissions before showing the notices
  * @uses bp_is_root_blog()
  */
 function bp_core_print_admin_notices() {
-    global $bp;
+    $bp = buddypress();
 
     // Only the super admin should see messages
@@ -171 +170 @@
  * @since BuddyPress (1.5)
  *
- * @global BuddyPress $bp The one true BuddyPress instance
  * @param string $notice The notice you are adding to the queue
  */
 function bp_core_add_admin_notice( $notice ) {
-    global $bp;
+    $bp = buddypress();
 
     if ( empty( $bp->admin->notices ) ) {
@@ -197 +195 @@
  */
 function bp_core_activation_notice() {
-    global $wp_rewrite, $wpdb, $bp;
+    global $wp_rewrite, $wpdb;
+
+    $bp = buddypress();
 
     // Only the super admin gets warnings
@@ -242 +242 @@
 
     // Only components with 'has_directory' require a WP page to function
-    foreach( $bp->loaded_components as $component_id => $is_active ) {
+    foreach( array_keys( $bp->loaded_components ) as $component_id ) {
         if ( !empty( $bp->{$component_id}->has_directory ) ) {
             $wp_page_components[] = array(
@@ -296 +296 @@
 
     if ( !empty( $dupes ) ) {
-        foreach( $dupes as $dupe_component => $dupe_id ) {
+        foreach( array_keys( $dupes ) as $dupe_component ) {
             $dupe_names[] = $bp->pages->{$dupe_component}->title;
         }