From 856dc92ef07c9fe06339349224533a12898b31d7 Mon Sep 17 00:00:00 2001
From: dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 19 Jun 2010 16:31:35 +0000
Subject: 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
---
 mod/groups/forum.php | 75 +++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 42 deletions(-)

(limited to 'mod/groups/forum.php')

diff --git a/mod/groups/forum.php b/mod/groups/forum.php
index 32ffea2da..c06bb2ebb 100644
--- a/mod/groups/forum.php
+++ b/mod/groups/forum.php
@@ -1,54 +1,45 @@
 <?php
-	/**
-	 * Elgg groups forum
-	 *
-	 * @package ElggGroups
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
+/**
+ * Elgg groups forum
+ */
 
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
-	$group_guid = (int)get_input('group_guid');
-	set_page_owner($group_guid);
-	if (!(page_owner_entity() instanceof ElggGroup)) {
-		forward();
-	}
+$group_guid = (int)get_input('group_guid');
+set_page_owner($group_guid);
+if (!(page_owner_entity() instanceof ElggGroup)) {
+	forward();
+}
 
-	group_gatekeeper();
+group_gatekeeper();
 
-	//get any forum topics
-	$options = array(
-		'type' => 'object',
-		'subtype' => 'groupforumtopic',
-		'annotation_name' => 'group_topic_post',
-		'limit' => 20,
-		'container_guid' => $group_guid,
-		'fullview' => FALSE
-	);
+//get any forum topics
+$options = array(
+	'type' => 'object',
+	'subtype' => 'groupforumtopic',
+	'limit' => 20,
+	'order_by' => 'e.last_action desc',
+	'container_guid' => $group_guid,
+	'fullview' => FALSE
+);
 
-	$topics = elgg_list_entities_from_annotations($options);
+//$topics = elgg_list_entities_from_annotations($options);
+$topics = elgg_list_entities($options);
 
-	// set up breadcrumbs
-	$group = get_entity($group_guid);
-	elgg_push_breadcrumb(elgg_echo('groups'), $CONFIG->wwwroot."pg/groups/world/");
-	elgg_push_breadcrumb($group->name, $group->getURL());
-	elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic'));
+// set up breadcrumbs
+$group = get_entity($group_guid);
+elgg_push_breadcrumb(elgg_echo('groups'), $CONFIG->wwwroot."pg/groups/world/");
+elgg_push_breadcrumb($group->name, $group->getURL());
+elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic'));
 
-	$area1 = elgg_view('navigation/breadcrumbs');
+$area1 = elgg_view('navigation/breadcrumbs');
 
-	$area1 .= elgg_view("forum/topics", array('topics' => $topics, 'group_guid' => $group_guid));
-	set_context('groups');
+$area1 .= elgg_view("forum/topics", array('topics' => $topics, 'group_guid' => $group_guid));
+set_context('groups');
 
-	$body = elgg_view_layout('one_column_with_sidebar', $area1);
+$body = elgg_view_layout('one_column_with_sidebar', $area1);
 
-	$title = elgg_echo('item:object:groupforumtopic');
+$title = elgg_echo('item:object:groupforumtopic');
 
-	// Finally draw the page
-	page_draw($title, $body);
-
-
-
-?>
\ No newline at end of file
+// Finally draw the page
+page_draw($title, $body);
\ No newline at end of file
-- 
cgit v1.2.3