Changeset 11950

Timestamp:

04/04/2018 11:05:58 AM (8 years ago)

Author:

djpaul

Message:

Activity, Akismet: fix infinite loop introduced in r11890

Props r-a-y

Fixes #6594

File:

• trunk/src/bp-activity/classes/class-bp-akismet.php (modified) (2 diffs)

trunk/src/bp-activity/classes/class-bp-akismet.php

@@ -415 +415 @@
                         if (
                                 Akismet::allow_discard() &&
-                                ! empty( $activity_data['bp_as_result_headers']['X-akismet-pro-tip'] ) &&
-                                $activity_data['bp_as_result_headers']['X-akismet-pro-tip'] === 'discard'
+                                ! empty( $activity_data['akismet_pro_tip'] ) &&
+                                'discard' === $activity_data['akismet_pro_tip']
                         ) {
                                 // If this is so spammy it's not worth your time, let's just delete it.
@@ -560 +560 @@
                 remove_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
 
-                $activity_data['bp_as_result_headers'] = array();
-                $activity_data['bp_as_result']         = '';
-
-                // Get the response.
-                if ( ! empty( $response[1] ) && ! is_wp_error( $response[1] ) ) {
-                        $activity_data['bp_as_result_headers'] = $response[0];
-                        $activity_data['bp_as_result']         = $response[1];
+                // Save response data.
+                $activity_data['bp_as_result'] = $response[1];
+                if ( isset( $response[0]['x-akismet-pro-tip'] ) ) {
+                        $activity_data['akismet_pro_tip'] = $response[0]['x-akismet-pro-tip'];
                 }