Changeset 6310 for trunk/bp-core/admin/bp-core-settings.php

Timestamp:

09/06/2012 04:24:22 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Admin Audit:

• Introduce bp_is_network_activated() to tell if BuddyPress is active at a network level.
• Use bp_is_network_activated() in places where multiblog or single-site activation might mistakingly link to the incorrect site/network admin.
• Add phpdoc to bp_is_multiblog_mode() to further explain why it exists, and why you should not use it.
• Audit usage of network_admin_url() and admin_url(), and replace with bp_get_admin_url() where appropriate.
• Escape some admin URL usages; maybe more to do here.

File:

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

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

@@ -248 +248 @@
 
     // We're saving our own options, until the WP Settings API is updated to work with Multisite
-    $form_action = add_query_arg( 'page', 'bp-settings', bp_core_do_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) );
+    $form_action = add_query_arg( 'page', 'bp-settings', bp_get_admin_url( 'admin.php' ) );
 
     ?>
@@ -314 +314 @@
         }
 
-        bp_core_redirect( add_query_arg( array( 'page' => 'bp-settings', 'updated' => 'true' ), bp_core_do_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) ) );
+        bp_core_redirect( add_query_arg( array( 'page' => 'bp-settings', 'updated' => 'true' ), bp_get_admin_url( 'admin.php' ) ) );
     }
 }