Changeset 7140

Timestamp:

11/03/2020 09:39:14 PM (4 years ago)

Author:

johnjamesjacoby

Message:

Replies: prevent adding empty values to pre-spam & pre-trash meta data.

This commit filters empty values from meta data before saving them, as well as removing a simple type-cast and replacing it with a more intentional is_array() check. This new approach works because get_post_meta() will call maybe_unserialize() and always return an array if it exists, or return an empty string if it does not. If it's not an array, we know it should be an empty one.

In branches/2.6, for 2.6.6. See #3409.

File:

• branches/2.6/src/includes/replies/functions.php (modified) (3 diffs)

branches/2.6/src/includes/replies/functions.php

@@ -415 +415 @@
 
                 // Get pre_trashed_replies for topic
-                $pre_trashed_replies = (array) get_post_meta( $topic_id, '_bbp_pre_trashed_replies', true );
+                $pre_trashed_meta = get_post_meta( $topic_id, '_bbp_pre_trashed_replies', true );
+
+                // Format the meta value
+                $pre_trashed_replies = is_array( $pre_trashed_meta )
+                    ? array_filter( $pre_trashed_meta )
+                    : array();
 
                 // Add this reply to the end of the existing replies
@@ -421 +426 @@
 
                 // Update the pre_trashed_reply post meta
-                update_post_meta( $topic_id, '_bbp_pre_trashed_replies', $pre_trashed_replies );
+                update_post_meta( $topic_id, '_bbp_pre_trashed_replies', array_filter( $pre_trashed_replies ) );
             }
 
@@ -434 +439 @@
 
                 // Get pre_spammed_replies for topic
-                $pre_spammed_replies = (array) get_post_meta( $topic_id, '_bbp_pre_spammed_replies', true );
+                $pre_trashed_meta = get_post_meta( $topic_id, '_bbp_pre_spammed_replies', true );
+
+                // Format the meta value
+                $pre_spammed_replies = is_array( $pre_trashed_meta )
+                    ? array_filter( $pre_trashed_meta )
+                    : array();
 
                 // Add this reply to the end of the existing replies