From 49282a68212eac58614a7b6ceafcdc4d77afac99 Mon Sep 17 00:00:00 2001 From: dave Date: Wed, 7 Apr 2010 17:08:16 +0000 Subject: conversations now use generic_comments for replies so no need for the extra logic in the river wrapper. git-svn-id: http://code.elgg.org/elgg/trunk@5658 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/riverdashboard/views/default/river/item/wrapper.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'mod/riverdashboard/views') diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index dba6f9953..16f94e185 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -17,22 +17,11 @@ if(get_context() == 'profile' && $object->getSubtype() == 'thewire') else $user = get_entity($vars['item']->subject_guid); -//get the right annotation type -//*todo - use the same for comments, everywhere e.g. comment -switch($vars['item']->subtype){ - case 'thewire': - $annotation_comment = 'wire_reply'; - break; - default: - $annotation_comment = 'generic_comment'; - break; -} - //count comment annotations $comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, $annotation_comment); //get last three comments display -$get_comments = get_annotations($vars['item']->object_guid, "", "", $annotation_comment, "", "", 3, 0, "desc"); +$get_comments = get_annotations($vars['item']->object_guid, "", "", 'generic_comment', "", "", 3, 0, "desc"); if($get_comments){ //reverse the array so we can display comments in the right order -- cgit v1.2.3