Ticket #1275: grunion-akismet-trunk-fix.diff

grunion-contact-form.php

@@ -390 +390 @@
 
         $contact_form_values = compact( $vars );
 
-        if ( function_exists( 'akismet_http_post' ) ) {
-                $spam = '';
-                $akismet_values = contact_form_prepare_for_akismet( $contact_form_values );
-                $is_spam = contact_form_is_spam_akismet( $akismet_values );
-                if ( is_wp_error( $is_spam ) )
-                        return; // abort
-                else if ( $is_spam )
-                        $spam = '***SPAM*** ';
-        }
+        $spam = '';
+        $akismet_values = contact_form_prepare_for_akismet( $contact_form_values );
+        $is_spam = apply_filters( 'contact_form_is_spam', $result = false, $akismet_values );
+        if ( is_wp_error( $is_spam ) )
+                return; // abort
+        else if ( $is_spam )
+                $spam = '***SPAM*** ';
 
         if ( !$comment_author )
                 $comment_author = $comment_author_email;
@@ -559 +557 @@
 }
 
 function contact_form_init() {
-        if ( function_exists( 'akismet_http_post' ) )
+        if ( function_exists( 'akismet_http_post' ) ) {
                 add_filter( 'contact_form_is_spam', 'contact_form_is_spam_akismet', 10, 2 );
+                add_action( 'contact_form_akismet', 'contact_form_akismet_submit', 10, 2 );
+        }
         if ( !has_filter( 'widget_text', 'do_shortcode' ) )
                 add_filter( 'widget_text', 'contact_form_widget_shortcode_hack', 5 );
 

admin.php

@@ -425 +425 @@
                 $post->post_status = 'spam';
                 $status = wp_insert_post( $post );
                 wp_transition_post_status( 'spam', 'publish', $post );
-                contact_form_akismet_submit( 'spam', $akismet_values );
+                do_action('contact_form_akismet', 'spam', $akismet_values );
         } elseif ( $_POST['make_it'] == 'ham' ) {
                 $post->post_status = 'publish';
                 $status = wp_insert_post( $post );
                 wp_transition_post_status( 'publish', 'spam', $post );
-                contact_form_akismet_submit( 'ham', $akismet_values );
+                do_action('contact_form_akismet', 'ham', $akismet_values );
 
                 // resend the original email
                 $email = get_post_meta( $post_id, '_feedback_email', TRUE );