Changeset 6579 for trunk/bp-core/admin/bp-core-functions.php

Timestamp:

12/10/2012 06:50:12 AM (14 years ago)

Author:

johnjamesjacoby

Message:

See #4761:

• More Credits changes...
• Update contributor avatars and metadata.
• Add update/activate redirection helpers.
• Code improvements to updater.

File:

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

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

@@ -162 +162 @@
 
 /**
- * Redirect user to bbPress's What's New page on activation
- *
- * @since bbPress (r4389)
- *
- * @internal Used internally to redirect bbPress to the about page on activation
+ * Redirect user to BuddyPress's What's New page on activation
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @internal Used internally to redirect BuddyPress to the about page on activation
  *
  * @uses get_transient() To see if transient to redirect exists
@@ -175 +175 @@
  * @uses admin_url() To get the admin URL to index.php
  *
- * @return If no transient, or in network admin, or is bulk activation
+ * @return If no transient, or is bulk activation
  */
 function bp_do_activation_redirect() {
@@ -187 +187 @@
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) )
-                return;
-
-        // Redirect to bbPress about page
-        wp_safe_redirect( add_query_arg( array( 'page' => 'bp-about' ), admin_url( 'index.php' ) ) );
+        if ( isset( $_GET['activate-multi'] ) )
+                return;
+
+        // Redirect to BuddyPress about page
+        wp_safe_redirect( add_query_arg( array( 'page' => 'bp-about' ), bp_get_admin_url( 'index.php' ) ) );
 }