Changeset 5076

Timestamp:

08/15/2013 06:10:05 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Add is_admin() and $pagenow checks to bbp_is_deactivation() and bbp_is_activation(). Hat tip alex-ye. Fixes #2386.

File:

• trunk/includes/core/update.php (modified) (2 diffs)

trunk/includes/core/update.php

@@ -51 +51 @@
  */
 function bbp_is_activation( $basename = '' ) {
+    global $pagenow;
+
     $bbp    = bbpress();
     $action = false;
+
+    // Bail if not in admin/plugins
+    if ( ! ( is_admin() && ( 'plugins.php' === $pagenow ) ) ) {
+        return false;
+    }
 
     if ( ! empty( $_REQUEST['action'] ) && ( '-1' !== $_REQUEST['action'] ) ) {
@@ -93 +100 @@
  */
 function bbp_is_deactivation( $basename = '' ) {
+    global $pagenow;
+
     $bbp    = bbpress();
     $action = false;
-    
+
+    // Bail if not in admin/plugins
+    if ( ! ( is_admin() && ( 'plugins.php' === $pagenow ) ) ) {
+        return false;
+    }
+
     if ( ! empty( $_REQUEST['action'] ) && ( '-1' !== $_REQUEST['action'] ) ) {
         $action = $_REQUEST['action'];