From 608647dcf59c60e55d86a69e39e2626e6f1eb6bc Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 3 Mar 2011 01:41:18 +0000
Subject: Refs #2679 - returning to a separate annotation for discussion forum
 replies. For those using the latest out of svn you can update with this
 script: https://gist.github.com/852092

git-svn-id: http://code.elgg.org/elgg/trunk@8570 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/lib/discussion.php | 16 ++++++++++++----
 mod/groups/lib/groups.php     |  1 -
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'mod/groups/lib')

diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 6c86ff83f..2a3de783b 100644
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -14,7 +14,6 @@ function discussion_handle_all_page() {
 	$content = elgg_list_entities(array(
 		'type' => 'object',
 		'subtype' => 'groupforumtopic',
-		'annotation_name' => 'generic_comment',
 		'order_by' => 'e.last_action desc',
 		'limit' => 40,
 		'full_view' => false,
@@ -165,12 +164,21 @@ function discussion_handle_view_page($guid) {
 
 	$content = elgg_view_entity($topic, true);
 	if ($topic->status == 'closed') {
-		$content .= elgg_view_comments($topic, false);
+		$content .= elgg_view('discussion/replies', array(
+			'entity' => $topic,
+			'show_add_form' => false,
+		));
 		$content .= elgg_view('discussion/closed');
 	} elseif ($group->isMember() || elgg_is_admin_logged_in()) {
-		$content .= elgg_view_comments($topic);
+		$content .= elgg_view('discussion/replies', array(
+			'entity' => $topic,
+			'show_add_form' => true,
+		));
 	} else {
-		$content .= elgg_view_comments($topic, false);
+		$content .= elgg_view('discussion/replies', array(
+			'entity' => $topic,
+			'show_add_form' => false,
+		));
 	}
 
 	$params = array(
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index be9bbfe19..563ed3cff 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -27,7 +27,6 @@ function groups_handle_all_page() {
 			$content = elgg_list_entities(array(
 				'type' => 'object',
 				'subtype' => 'groupforumtopic',
-				'annotation_name' => 'generic_comment',
 				'order_by' => 'e.last_action desc',
 				'limit' => 40,
 				'fullview' => false,
-- 
cgit v1.2.3