Changeset 5325 for trunk/bp-activity/bp-activity-functions.php

Timestamp:

11/12/2011 09:09:29 PM (13 years ago)

Author:

djpaul

Message:

See #3660. Activity admin iteration.

• Update automatic Akismet submission hook priority (r5276).
• Update "In Response To" column.
• Update Contextual Help.
• Spam, un-spam and delete action buttons work.
• Small styling tweaks.
• Switched some $bp global and BP_VERSION to use the new wrapper functions.

File:

• trunk/bp-activity/bp-activity-functions.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-functions.php

@@ -1360 +1360 @@
     // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity
     if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
-        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 1, 1 );
+        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4, 1 );
 
         // Build data package for Akismet
@@ -1396 +1396 @@
     // If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity
     if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
-        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 1, 1 );
+        remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4, 1 );
 
         // Build data package for Akismet
@@ -1408 +1408 @@
     }
 
-    //DJPAULTODO: Run bp_activity_at_name_filter() somehow... but not twice, if we can help it. Maybe check if it was auto-spammed by Akismet?
     do_action( 'bp_activity_mark_as_ham', $activity, $source );
 }