aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-04-22 13:41:16 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-04-22 13:41:16 +0000
commitd99f1028ce873ab99c345dcea5b4fba67d73203d (patch)
tree7e197feb9c0c7f23335efae81ba35cc31d22a098 /mod
parent83ea3afb81f7f22006a1fde881ed73d155fee40f (diff)
downloadelgg-d99f1028ce873ab99c345dcea5b4fba67d73203d.tar.gz
elgg-d99f1028ce873ab99c345dcea5b4fba67d73203d.tar.bz2
Closes #957: Groups topics now handle deleted users, I recommend that people look at what I've done and handle deleted users in a similar way in their plugins.
git-svn-id: https://code.elgg.org/elgg/trunk@3226 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/views/default/forum/topicposts.php5
-rw-r--r--mod/groups/views/default/object/groupforumtopic.php6
2 files changed, 6 insertions, 5 deletions
diff --git a/mod/groups/views/default/forum/topicposts.php b/mod/groups/views/default/forum/topicposts.php
index fbfb7264f..a9afd87ca 100644
--- a/mod/groups/views/default/forum/topicposts.php
+++ b/mod/groups/views/default/forum/topicposts.php
@@ -31,8 +31,9 @@
//display the user name
echo "<p><b>" . $post_owner->name . "</b><br />";
- } else {
- echo "<p>";
+ } else {
+ echo "<div class=\"post_icon\"><img src=\"" . elgg_view('icon/user/default/small') . "\" /></div>";
+ echo "<p><b>" . elgg_echo('profile:deleteduser') . "</b><br />";
}
//display the date of the comment
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 021d139ca..a6d214fcf 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -29,12 +29,12 @@
}
$u = get_user($last_user);
-
+
//select the correct output depending on where you are
if(get_context() == "search"){
$info = "<p class=\"latest_discussion_info\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "<br /><span class=\"timestamp\">";
- if ($last_time) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>");
+ if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>");
$info .= '</span></p>';
//get the group avatar
$icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small'));
@@ -49,7 +49,7 @@
}else{
$info = "<span class=\"latest_discussion_info\"><span class=\"timestamp\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "</span>";
- if ($last_time) $info.= "<br /><span class='timestamp'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></span>";
+ if (($last_time) && ($u)) $info.= "<br /><span class='timestamp'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></span>";
if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {