updated the group discussion river view

git-svn-id: http://code.elgg.org/elgg/trunk@6380 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 7 insertions, 1 deletions

diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index def502afd..8a6691474 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -41,6 +41,7 @@
 			'groups:widget:membership' => 'Group membership',
 			'groups:widgets:description' => 'Display the groups you are a member of on your profile',
 			'groups:noaccess' => 'No access to group',
+			'groups:ingroup' => 'in the group',
 			'groups:cantedit' => 'You can not edit this group',
 			'groups:saved' => 'Group saved',
 			'groups:featured' => 'Featured groups',
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index a8d444465..0b65f79b6 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -5,6 +5,7 @@
 	$object_url = $object->getURL();
 	$forumtopic = $object->guid;
 	$group_guid = $object->container_guid;
+	$group = get_entity($group_guid);
 	$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
 	$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); 
 	foreach($comment as $c){
@@ -13,7 +14,11 @@
 	$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
 	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
-	$string .= "<a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span> <a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
+	$string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
+	if(get_context() != 'groups'){
+		$string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>";
+	}
+	$string .= " <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	$string .= "<div class=\"river_content_display\">";
 	$string .= elgg_make_excerpt($contents, 200);