There was no point in group discussions having their own comment annotations, better to use the generic comments so this has been changed and a full group activity stream added. For v1.8, there will need to be an upgrade script which will change 'group_topic_post' -> 'generic_comment' and on all existing topics, take the first annotation of type 'group_topic_post' and populate the topic's description.

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

1 files changed, 9 insertions, 8 deletions

diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index 0b65f79b6..fb2a3556d 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -7,19 +7,20 @@
 	$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){
-		$contents = $c->value;
-	}
+	//$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); 
+	//foreach($comment as $c){
+	$contents = $object->description;
+	//}
 	$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>";
-	if(get_context() != 'groups'){
-		$string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>";
+	$string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>";
+	$string .= " <span class='entity_subtext'>". friendly_time($object->time_created) ."</span>";
+	if (isloggedin() && $object->status != "closed") {
+		$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
+		$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	}
-	$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);
 	$string .= "</div>";