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, 3 insertions, 4 deletions

diff --git a/mod/groups/actions/forums/addtopic.php b/mod/groups/actions/forums/addtopic.php
index 085e2196e..1bb4c0588 100644
--- a/mod/groups/actions/forums/addtopic.php
+++ b/mod/groups/actions/forums/addtopic.php
@@ -49,6 +49,8 @@
 			$grouptopic->access_id = $access;
 	// Set its title and description appropriately
 			$grouptopic->title = $title;
+	// Set its title and description appropriately
+			$grouptopic->description = $message;
 	// Before we can set metadata, we need to save the topic
 			if (!$grouptopic->save()) {
 				register_error(elgg_echo("grouptopic:error"));
@@ -60,10 +62,7 @@
 			}
 	// add metadata
 	        $grouptopic->status = $status; // the current status i.e sticky, closed, resolved, open
-	           
-    // now add the topic message as an annotation
-        	$grouptopic->annotate('group_topic_post',$message,$access, $user);   
-        	
+	             	
     // add to river
 	        add_to_river('river/forum/topic/create','create',$_SESSION['user']->guid,$grouptopic->guid);