Ticket #8505: 8505-review.patch

src/bp-messages/bp-messages-functions.php

@@ -757 +757 @@
         if ( ! $user_id ) {
                 $user_id = bp_loggedin_user_id();
         }
+
         // Bail if no user is set.
         if ( ! $user_id ) {
                 return $retval;
@@ -767 +768 @@
         } else {
                 $notice = BP_Messages_Notice::get_active();
         }
+
         // Bail if no notice is set.
         if ( empty( $notice->id ) ) {
                 return $retval;
         }
 
         // Fetch the user's closed notices and add the new item.
-        $closed_notices = bp_get_user_meta( $user_id, 'closed_notices', true );
-        if ( empty( $closed_notices ) || ! is_array( $closed_notices ) ) {
-                $closed_notices = array();
-        }
+        $closed_notices = (array) bp_get_user_meta( $user_id, 'closed_notices', true );
 
         if ( in_array( (int) $notice->id, $closed_notices, true ) ) {
                 // The notice has already been dismissed, so there's nothing to do.
@@ -786 +785 @@
                 $closed_notices[] = (int) $notice->id;
                 $closed_notices   = array_map( 'absint', array_unique( $closed_notices ) );
                 $success          = bp_update_user_meta( $user_id, 'closed_notices', $closed_notices );
+
                 // The return value from update_user_meta() could be an integer or a boolean.
                 $retval = (bool) $success;
         }