aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-07 17:08:16 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-07 17:08:16 +0000
commit49282a68212eac58614a7b6ceafcdc4d77afac99 (patch)
tree476c8e4e32b4920a062c9ac0d4e01d60450bf8ba
parentae88842fce124942780875fef7d0158b8c87d9aa (diff)
downloadelgg-49282a68212eac58614a7b6ceafcdc4d77afac99.tar.gz
elgg-49282a68212eac58614a7b6ceafcdc4d77afac99.tar.bz2
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
-rw-r--r--mod/riverdashboard/views/default/river/item/wrapper.php13
1 files changed, 1 insertions, 12 deletions
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