Changeset 6301 for trunk/bp-core/bp-core-update.php

Timestamp:

09/04/2012 02:24:31 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Core Update:

• Port _is_activation() and _is_deactivation() code from bbPress.
• Includes handling for bulk plugin activation/deactivation.

File:

• trunk/bp-core/bp-core-update.php (modified) (5 diffs)

trunk/bp-core/bp-core-update.php

@@ -38 +38 @@
  * @since BuddyPress (1.6)
  *
- * @global BuddyPress $bp
+ * @uses buddypress()
  * @return bool True if activating BuddyPress, false if not
  */
 function bp_is_activation( $basename = '' ) {
-    global $bp;
+    $bp = buddypress();
 
-    // Baif if action or plugin are empty
-    if ( empty( $_GET['action'] ) || empty( $_GET['plugin'] ) )
+    $action = false;
+    if ( ! empty( $_REQUEST['action'] ) && ( '-1' != $_REQUEST['action'] ) )
+        $action = $_REQUEST['action'];
+    elseif ( ! empty( $_REQUEST['action2'] ) && ( '-1' != $_REQUEST['action2'] ) )
+        $action = $_REQUEST['action2'];
+
+    // Bail if not activating
+    if ( empty( $action ) || !in_array( $action, array( 'activate', 'activate-selected' ) ) )
         return false;
 
-    // Bail if not activating
-    if ( 'activate' !== $_GET['action'] )
-        return false;
-
-    // The plugin being activated
-    $plugin = isset( $_GET['plugin'] ) ? $_GET['plugin'] : '';
+    // The plugin(s) being activated
+    if ( $action == 'activate' )
+        $plugins = isset( $_GET['plugin'] ) ? array( $_GET['plugin'] ) : array();
+    else
+        $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
 
     // Set basename if empty
@@ -63 +68 @@
         return false;
 
-    // Bail if plugin is not BuddyPress
-    if ( $basename !== $plugin )
-        return false;
-
-    return true;
+    // Is BuddyPress being activated?
+    return in_array( $basename, $plugins );
 }
 
@@ -75 +77 @@
  * @since BuddyPress (1.6)
  *
- * @global BuddyPress $bp
+ * @uses buddypress()
  * @return bool True if deactivating BuddyPress, false if not
  */
 function bp_is_deactivation( $basename = '' ) {
-    global $bp;
+    $bp = buddypress();
 
-    // Baif if action or plugin are empty
-    if ( empty( $_GET['action'] ) || empty( $_GET['plugin'] ) )
+    $action = false;
+    if ( ! empty( $_REQUEST['action'] ) && ( '-1' != $_REQUEST['action'] ) )
+        $action = $_REQUEST['action'];
+    elseif ( ! empty( $_REQUEST['action2'] ) && ( '-1' != $_REQUEST['action2'] ) )
+        $action = $_REQUEST['action2'];
+
+    // Bail if not deactivating
+    if ( empty( $action ) || !in_array( $action, array( 'deactivate', 'deactivate-selected' ) ) )
         return false;
 
-    // Bail if not deactivating
-    if ( 'deactivate' !== $_GET['action'] )
-        return false;
-
-    // The plugin being deactivated
-    $plugin = isset( $_GET['plugin'] ) ? $_GET['plugin'] : '';
+    // The plugin(s) being deactivated
+    if ( $action == 'deactivate' )
+        $plugins = isset( $_GET['plugin'] ) ? array( $_GET['plugin'] ) : array();
+    else
+        $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
 
     // Set basename if empty
@@ -100 +107 @@
         return false;
 
-    // Bail if plugin is not BuddyPress
-    if ( $basename !== $plugin )
-        return false;
-
-    return true;
+    // Is bbPress being deactivated?
+    return in_array( $basename, $plugins );
 }
 
@@ -194 +198 @@
     do_action( 'bp_uninstall' );
 }
-
-?>