Changeset 2444

Timestamp:

06/22/2010 05:44:30 PM (16 years ago)

Author:

chrishajer

Message:

Move Akismet check to pre_post_status, not pre_post. Fixes #1276. Props mdawaffe

Location:

trunk

Files:

• bb-includes/functions.bb-meta.php (modified) (1 diff)
• bb-plugins/akismet.php (modified) (2 diffs)

trunk/bb-includes/functions.bb-meta.php

@@ -298 +298 @@
             break;
         case 'version':
-            return '1.1-alpha-2443'; // Don't filter
+            return '1.1-alpha-2444'; // Don't filter
             break;
         case 'bb_db_version' :

trunk/bb-plugins/akismet.php

@@ -320 +320 @@
 function bb_ksd_check_post( $post_text )
 {
-    global $bb_current_user;
-    global $bb_ksd_pre_post_status;
-
-    // Don't filter content from users with a trusted role
-    if ( in_array( $bb_current_user->roles[0], bb_trusted_roles() ) ) {
-        return $post_text;
-    }
-
-    $response = bb_ksd_submit( $post_text );
-    if ( 'true' == $response[1] ) {
-        $bb_ksd_pre_post_status = '2';
-    }
-    bb_akismet_delete_old();
+    global $bb_ksd_pre_post_status, $bb_ksd_pre_post;
+
+    $bb_ksd_pre_post = $post_text;
+
     return $post_text;
 }
@@ -394 +385 @@
 function bb_ksd_pre_post_status( $post_status )
 {
-    global $bb_ksd_pre_post_status;
-    if ( '2' == $bb_ksd_pre_post_status ) {
-        $post_status = $bb_ksd_pre_post_status;
+    global $bb_current_user, $bb_ksd_pre_post_status, $bb_ksd_pre_post;
+
+    // Don't filter content from users with a trusted role
+    if ( in_array( $bb_current_user->roles[0], bb_trusted_roles() ) ) {
+        return $post_status;
+    }
+
+    $response = bb_ksd_submit( $bb_ksd_pre_post );
+    if ( 'true' == $response[1] ) {
+        $bb_ksd_pre_post_status = '2';
+        return $bb_ksd_pre_post_status;
     }
     return $post_status;