<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2362] trunk: Fixes #1617 - Show deleted user'
 s name on forum posts as &quot;Deleted User&quot;.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2362</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-19 16:02:35 +0000 (Tue, 19 Jan 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #1617 - Show deleted user's name on forum posts as &quot;Deleted User&quot;.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsclassesphp">trunk/bp-friends/bp-friends-classes.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2361 => 2362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php        2010-01-19 15:40:59 UTC (rev 2361)
+++ trunk/bp-activity.php        2010-01-19 16:02:35 UTC (rev 2362)
</span><span class="lines">@@ -900,6 +900,10 @@
</span><span class="cx">         // Clear the user's activity from the sitewide stream and clear their activity tables
</span><span class="cx">         BP_Activity_Activity::delete_for_user( $user_id );
</span><span class="cx"> 
</span><ins>+        // Remove any usermeta
+        delete_usermeta( $user_id, 'bp_latest_update' );
+        delete_usermeta( $user_id, 'bp_favorite_activities' );
+
</ins><span class="cx">         do_action( 'bp_activity_remove_data', $user_id );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wpmu_delete_user', 'bp_activity_remove_data' );
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2361 => 2362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php        2010-01-19 15:40:59 UTC (rev 2361)
+++ trunk/bp-core.php        2010-01-19 16:02:35 UTC (rev 2362)
</span><span class="lines">@@ -1069,6 +1069,9 @@
</span><span class="cx"> function bp_core_get_userlink( $user_id, $no_anchor = false, $just_link = false, $deprecated = false, $with_s = false ) {
</span><span class="cx">         $display_name = bp_core_get_user_displayname( $user_id );
</span><span class="cx"> 
</span><ins>+        if ( empty( $display_name ) )
+                return false;
+
</ins><span class="cx">         if ( $with_s )
</span><span class="cx">                 $display_name = sprintf( __( &quot;%s's&quot;, 'buddypress' ), $display_name );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (2361 => 2362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php        2010-01-19 15:40:59 UTC (rev 2361)
+++ trunk/bp-forums/bp-forums-templatetags.php        2010-01-19 16:02:35 UTC (rev 2362)
</span><span class="lines">@@ -274,7 +274,10 @@
</span><span class="cx">         function bp_get_the_topic_poster_name() {
</span><span class="cx">                 global $forum_template;
</span><span class="cx"> 
</span><del>-                return apply_filters( 'bp_get_the_topic_poster_name', bp_core_get_userlink( $forum_template-&gt;topic-&gt;topic_poster ) );
</del><ins>+                if ( !$name = bp_core_get_userlink( $forum_template-&gt;topic-&gt;poster_id ) )
+                        return __( 'Deleted User', 'buddypress' );
+
+                return apply_filters( 'bp_get_the_topic_poster_name', $name );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> function bp_the_topic_object_id() {
</span><span class="lines">@@ -320,7 +323,10 @@
</span><span class="cx">         function bp_get_the_topic_last_poster_name() {
</span><span class="cx">                 global $forum_template;
</span><span class="cx"> 
</span><del>-                return apply_filters( 'bp_get_the_topic_last_poster_name', bp_core_get_userlink( $forum_template-&gt;topic-&gt;topic_last_poster ) );
</del><ins>+                if ( !$name = bp_core_get_userlink( $forum_template-&gt;topic-&gt;topic_last_poster ) )
+                        return __( 'Deleted User', 'buddypress' );
+
+                return apply_filters( 'bp_get_the_topic_last_poster_name', $name );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> function bp_the_topic_object_avatar( $args = '' ) {
</span><span class="lines">@@ -855,6 +861,9 @@
</span><span class="cx">         function bp_get_the_topic_post_poster_name() {
</span><span class="cx">                 global $topic_template;
</span><span class="cx"> 
</span><ins>+                if ( !$name = bp_core_get_userlink( $topic_template-&gt;post-&gt;poster_id ) )
+                        return __( 'Deleted User', 'buddypress' );
+
</ins><span class="cx">                 return apply_filters( 'bp_get_the_topic_post_poster_name', bp_core_get_userlink( $topic_template-&gt;post-&gt;poster_id ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-classes.php (2361 => 2362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-classes.php        2010-01-19 15:40:59 UTC (rev 2361)
+++ trunk/bp-friends/bp-friends-classes.php        2010-01-19 16:02:35 UTC (rev 2362)
</span><span class="lines">@@ -321,6 +321,4 @@
</span><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-
-
</del><span class="cx"> ?&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>