Changeset 13467

Timestamp:

04/30/2023 07:54:12 AM (3 years ago)

Author:

imath

Message:

Improve how the BP_Akismet() class displays an activity history

When the Akismet plugin is active and is used to prevent BP Activity spams, each Activity item gets an Akismet history. This history is only generated for activities being posted once Akismet is on. As a result, there can be old activities with no history. To avoid potential PHP errors/notices, we need to verify the Activity Meta used to store the history is an array and has a time key.

As we are dealing with the latest history entry only, we do not need to sort the Activity Meta.

To display the activity history into its single WP Admin screen, we now need to use the time & message keys of the Activity Meta.

Props mystichrome

Fixes #8873 (11.0 branch)

File:

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

branches/11.0/src/bp-activity/classes/class-bp-akismet.php

@@ -644 +644 @@
                 $history = BP_Akismet::get_activity_history( $item->id );
 
-                if ( empty( $history ) )
-                        return;
-
-                echo '<div class="akismet-history"><div>';
-                /* translators: 1: the human diff time. 2: the akismet history data. */
-                printf( _x( '%1$s &mdash; %2$s', 'x hours ago - akismet cleared this item', 'buddypress' ), '<span>' . bp_core_time_since( $history[2] ) . '</span>', esc_html( $history[1] ) );
-                echo '</div></div>';
+                if ( empty( $history ) ) {
+                        $message = '&mdash;';
+                } else {
+                        /* translators: 1: the human diff time. 2: the akismet history data. */
+                        $message = sprintf( _x( '%1$s &mdash; %2$s', 'x hours ago - akismet cleared this item', 'buddypress' ), '<span>' . bp_core_time_since( $history['time'] ) . '</span>', esc_html( $history['message'] ) );
+                }
+
+                printf( '<div class="akismet-history"><div>%s</div></div>', wp_kses( $message, array( 'span' => true ) ) );
         }
 
@@ -684 +685 @@
         public function get_activity_history( $activity_id = 0 ) {
                 $history = bp_activity_get_meta( $activity_id, '_bp_akismet_history' );
-                if ( $history === false )
+                if ( $history && is_array( $history ) && isset( $history['time'] ) ) {
+                        $history['time'] = (int) $history['time'];
+                } else {
                         $history = array();
-
-                // Sort it by the time recorded.
-                usort( $history, 'akismet_cmp_time' );
+                }
 
                 return $history;