Changeset 6052

Timestamp:

05/31/2012 11:10:13 PM (12 years ago)

Author:

boonebgorges

Message:

Show 'Deleted User' throughout messages component when user has been deleted.

Fixes #4227

Location:

trunk/bp-messages

Files:

• bp-messages-classes.php (modified) (1 diff)
• bp-messages-template.php (modified) (1 diff)

trunk/bp-messages/bp-messages-classes.php

@@ -263 +263 @@
         $recipient_links = array();
 
-        foreach ( (array) $recipients as $recipient )
-            $recipient_links[] = bp_core_get_userlink( $recipient->user_id );
+        foreach ( (array) $recipients as $recipient ) {
+            $recipient_link = bp_core_get_userlink( $recipient->user_id );
+
+            if ( empty( $recipient_link ) ) {
+                $recipient_link = __( 'Deleted User', 'buddypress' );
+            }
+
+            $recipient_links[] = $recipient_link;
+        }
 
         return implode( ', ', (array) $recipient_links );

trunk/bp-messages/bp-messages-template.php

@@ -841 +841 @@
 
         foreach( (array) $thread_template->thread->recipients as $recipient ) {
-            if ( (int) $recipient->user_id !== bp_loggedin_user_id() )
-                $recipient_links[] = bp_core_get_userlink( $recipient->user_id );
+            if ( (int) $recipient->user_id !== bp_loggedin_user_id() ) {
+                $recipient_link = bp_core_get_userlink( $recipient->user_id );
+
+                if ( empty( $recipient_link ) ) {
+                    $recipient_link = __( 'Deleted User', 'buddypress' );
+                }
+
+                $recipient_links[] = $recipient_link;
+            }
         }