Changeset 4390

Timestamp:

11/11/2012 07:14:21 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Activation:

• When activating bbPress, redirect to the "What's New" page.
• Replaces incomplete code in /admin/functions.php with update action and activation hook helper.
• See #2018.

Location:

trunk/includes

Files:

• admin/actions.php (modified) (2 diffs)
• admin/functions.php (modified) (1 diff)
• core/actions.php (modified) (1 diff)
• core/update.php (modified) (1 diff)

trunk/includes/admin/actions.php

@@ -55 +55 @@
 add_action( 'bbp_admin_init', 'bbp_register_admin_style'        );
 add_action( 'bbp_admin_init', 'bbp_register_admin_settings'     );
+add_action( 'bbp_admin_init', 'bbp_do_activation_redirect', 1   );
 
 // Initialize the admin area
@@ -63 +64 @@
 
 // Activation
-add_action( 'bbp_activation', 'bbp_delete_rewrite_rules' );
+add_action( 'bbp_activation', 'bbp_delete_rewrite_rules'    );
 
 // Deactivation
 add_action( 'bbp_deactivation', 'bbp_remove_caps'          );
 add_action( 'bbp_deactivation', 'bbp_delete_rewrite_rules' );
-add_action( 'bbp_deactivation', 'bbp_deactivated'          );
 
 // New Site

trunk/includes/admin/functions.php

@@ -144 +144 @@
 
 /**
- * We are activating bbPress
- *
- * @since bbPress (r4152)
- */
-function bbp_activating() {
-    update_option( '_bbp_activated', '0' );
-}
-
-/**
- * bbPress is activated
- *
- * @since bbPress (r4152)
- */
-function bbp_activated() {
-    update_option( '_bbp_activated', '1' );
-}
-
-/**
- * bbPress is deactivated
- *
- * @since bbPress (r4152)
- */
-function bbp_deactivated() {
-    delete_option( '_bbp_activated' );
-}
-
-function bbp_activation_redirect() {
-    if ( ! get_option( '_bbp_activated' ) || bbp_is_activation() )
-        return;
-
-    wp_safe_redirect( admin_url( add_query_arg( array( 'page' => 'bbp-about' ), 'index.php' ) ) );
-    exit();
+ * 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
+ *
+ * @uses get_transient() To see if transient to redirect exists
+ * @uses delete_transient() To delete the transient if it exists
+ * @uses is_network_admin() To bail if being network activated
+ * @uses wp_safe_redirect() To redirect
+ * @uses add_query_arg() To help build the URL to redirect to
+ * @uses admin_url() To get the admin URL to index.php
+ *
+ * @return If no transient, or in network admin, or is bulk activation
+ */
+function bbp_do_activation_redirect() {
+
+    // Bail if no activation redirect
+    if ( ! get_transient( '_bbp_activation_redirect' ) )
+        return;
+
+    // Delete the redirect transient
+    delete_transient( '_bbp_activation_redirect' );
+
+    // 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' => 'bbp-about' ), admin_url( 'index.php' ) ) );
 }
 

trunk/includes/core/actions.php

@@ -293 +293 @@
 add_action( 'bbp_login_form_login', 'bbp_user_maybe_convert_pass' );
 
+add_action( 'bbp_activation', 'bbp_add_activation_redirect' );
+
 /**
  * Requires and creates the BuddyPress extension, and adds component creation

trunk/includes/core/update.php

@@ -268 +268 @@
     bbp_delete_rewrite_rules();
 }
+
+/**
+ * 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
+ *
+ * @uses is_network_admin() To bail if being network activated
+ * @uses set_transient() To drop the activation transient for 30 seconds
+ *
+ * @return If network admin or bulk activation
+ */
+function bbp_add_activation_redirect() {
+
+    // Bail if activating from network, or bulk
+    if ( is_network_admin() || isset( $_GET['activate-multi'] ) )
+        return;
+
+    // Add the transient to redirect
+    set_transient( '_bbp_activation_redirect', true, 30 );
+}