Changeset 5582

Timestamp:

12/22/2011 07:25:04 PM (13 years ago)

Author:

djpaul

Message:

Check to see if another plugin has disabled Activity's Akismet support. Fixes #3880

File:

• trunk/bp-activity/bp-activity-actions.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -600 +600 @@
 
     // Bail if Akismet is not active
-    if ( !defined( 'AKISMET_VERSION' ) )
+    if ( ! defined( 'AKISMET_VERSION' ) )
         return;
 
     // Bail if no Akismet key is set
-    if ( !bp_get_option( 'wordpress_api_key' ) && !defined( 'WPCOM_API_KEY' ) )
+    if ( ! bp_get_option( 'wordpress_api_key' ) && ! defined( 'WPCOM_API_KEY' ) )
+        return;
+
+    // Bail if BuddyPress Activity Akismet support has been disabled by another plugin
+    if ( ! apply_filters( 'bp_activity_use_akismet', true ) )
         return;
 
@@ -610 +614 @@
     $bp->activity->akismet = new BP_Akismet();
 }
-
 ?>