Changeset 5276

Timestamp:

11/05/2011 08:52:03 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Increase Activity stream Akismet priority from 1 to 4. Tweak Akismet setup to split out Akismet activation and missing key scenarios.

Location:

trunk/bp-activity

Files:

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

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

@@ -599 +599 @@
     global $bp;
 
-    $akismet_key = bp_get_option( 'wordpress_api_key' );
-
-    // Load Akismet support if Akismet is configured
-    if ( !defined( 'AKISMET_VERSION' ) || ( empty( $akismet_key ) && !defined( 'WPCOM_API_KEY' ) ) )
+    // Bail if Akismet is not active
+    if ( !defined( 'AKISMET_VERSION' ) )
+        return;
+
+    // Bail if no Akismet key is set
+    if ( !bp_get_option( 'wordpress_api_key' ) && !defined( 'WPCOM_API_KEY' ) )
         return;
 

trunk/bp-activity/bp-activity-akismet.php

@@ -45 +45 @@
 
         // Check activity for spam
-        add_action( 'bp_activity_before_save',     array( $this, 'check_activity' ), 1, 1 );
+        add_action( 'bp_activity_before_save',     array( $this, 'check_activity' ), 4, 1 );
 
         // Tidy up member's latest (activity) update