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/views/default/forms/forums/addpost.php  | 34 ----------------------
 .../views/default/forms/forums/edittopic.php       | 11 ++-----
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 mod/groups/views/default/forms/forums/addpost.php

(limited to 'mod/groups/views/default/forms')

diff --git a/mod/groups/views/default/forms/forums/addpost.php b/mod/groups/views/default/forms/forums/addpost.php
deleted file mode 100644
index c5236c532..000000000
--- a/mod/groups/views/default/forms/forums/addpost.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-	/**
-	 * Elgg group forum post edit/add page
-	 * 
-	 * @package ElggGroups
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 * 
-	 * @uses $vars['entity'] Optionally, the post to edit
-	 */
-	    
-?>
-<form action="<?php echo $vars['url']; ?>action/groups/addpost" method="post" class="margin_top">
-	<label><?php echo elgg_echo("groups:reply"); ?></label>
-	<?php
-	
-	echo elgg_view("input/longtext",array(
-						"internalname" => "topic_post",
-						"value" => $body,
-										));
-	?>
-	
-		
-    <!-- pass across the topic guid -->
-	<input type="hidden" name="topic_guid" value="<?php echo $vars['entity']->guid; ?>" />
-	<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->container_guid; ?>" />
-			
-	<?php echo elgg_view('input/securitytoken'); ?>
-	<!-- display the post button -->
-	<input type="submit" class="submit_button" value="<?php echo elgg_echo('post'); ?>" />
-</form>
diff --git a/mod/groups/views/default/forms/forums/edittopic.php b/mod/groups/views/default/forms/forums/edittopic.php
index 89c8c441b..cfaae5dd9 100644
--- a/mod/groups/views/default/forms/forums/edittopic.php
+++ b/mod/groups/views/default/forms/forums/edittopic.php
@@ -17,12 +17,7 @@
 	    $status = $vars['entity']->status;
 	    $tags = $vars['entity']->tags;
 	    $title = $vars['entity']->title;
-	    $message = $vars['entity']->getAnnotations('group_topic_post', 1, 0, "asc");
-	    
-	    foreach($message as $mes){
-			$messsage_content = $mes->value;
-		    $message_id = $mes->id;
-	    }		    
+	    $message = $vars['entity']->description;		    
 		    
 	 // get the group GUID
 	    $group_guid = get_input("group");
@@ -72,7 +67,7 @@
 
 				echo elgg_view("input/longtext",array(
 									"internalname" => "topicmessage",
-									"value" => $messsage_content,
+									"value" => html_entity_decode($message, ENT_COMPAT, 'UTF-8')
 													));
 			?>
 		</p>
@@ -82,8 +77,6 @@
 		    <label><?php echo elgg_echo("groups:topicstatus"); ?><br />
 		    <select name="status">
 		        <option value="open" <?php if($status == "") echo "SELECTED";?>><?php echo elgg_echo('groups:topicopen'); ?></option>
-		        <option value="sticky" <?php if($status == "sticky") echo "SELECTED";?>><?php echo elgg_echo('groups:topicsticky'); ?></option>
-		        <option value="resolved" <?php if($status == "resolved") echo "SELECTED";?>><?php echo elgg_echo('groups:topicresolved'); ?></option>
 		        <option value="closed" <?php if($status == "closed") echo "SELECTED";?>><?php echo elgg_echo('groups:topicclosed'); ?></option>
 		    </select>
 		    </label>
-- 
cgit v1.2.3