Changeset 6734

Timestamp:

01/21/2013 06:12:46 PM (12 years ago)

Author:

djpaul

Message:

Make BP respect the value of "use akismet for activity checks" preference. Fixes #4773

This bug was introduced during 1.6 development.

Location:

trunk/bp-activity

Files:

• bp-activity-actions.php (modified) (1 diff)
• bp-activity-loader.php (modified) (1 diff)

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

@@ -592 +592 @@
 
     // Bail if BuddyPress Activity Akismet support has been disabled by another plugin
-    if ( ! apply_filters( 'bp_activity_use_akismet', true ) )
+    if ( ! apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) )
         return;
 

trunk/bp-activity/bp-activity-loader.php

@@ -53 +53 @@
         // Load Akismet support if Akismet is configured
         $akismet_key = bp_get_option( 'wordpress_api_key' );
-        if ( defined( 'AKISMET_VERSION' ) && ( !empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) && apply_filters( 'bp_activity_use_akismet', true ) )
+        if ( defined( 'AKISMET_VERSION' ) && ( !empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) && apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) )
             $includes[] = 'akismet';