From 7bbb0ca2fb7e205074a9009f7604cb2c289cca73 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 20 Oct 2010 23:33:54 +0000 Subject: Merges [7038] into trunk from 1.7 branch git-svn-id: http://code.elgg.org/elgg/trunk@7111 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/annotation/annotate.php | 48 ++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'views/default/annotation/annotate.php') diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php index bfef8e08e..0ee972e77 100644 --- a/views/default/annotation/annotate.php +++ b/views/default/annotation/annotate.php @@ -1,29 +1,31 @@ subject_guid); - $object = get_entity($vars['item']->object_guid); - $url = $object->getURL(); - $title = $object->title; - if(!$title) - $title = elgg_echo('file:untitled'); - $subtype = get_subtype_from_id($object->subtype); - //grab the annotation, if one exists - if($vars['item']->annotation_id != 0) - $comment = get_annotation($vars['item']->annotation_id)->value; - $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("river:posted:generic"),$url) . " "; - $string .= elgg_echo("{$subtype}:river:annotate") . " getURL()}\">" . $title . " ". elgg_view_friendly_time($object->time_created) ."Comment"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); - $string .= ""; - if(get_context() != 'riverdashboard'){ +$performed_by = get_entity($vars['item']->subject_guid); +$object = get_entity($vars['item']->object_guid); +$url = $object->getURL(); +$title = $object->title; +if (!$title) { + $title = elgg_echo('file:untitled'); +} + +$subtype = get_subtype_from_id($object->subtype); +//grab the annotation, if one exists +$comment = ''; +if ($vars['item']->annotation_id != 0) { + $comment = get_annotation($vars['item']->annotation_id)->value; +} + +$url = "getURL()}\">{$performed_by->name}"; +$string = sprintf(elgg_echo("river:posted:generic"), $url) . " "; +$string .= elgg_echo("{$subtype}:river:annotate") . " getURL()}\">" . $title . " " . elgg_view_friendly_time($object->time_created) . "Comment"; +$string .= elgg_view('likes/forms/link', array('entity' => $object)); +$string .= ""; +if (get_context() != 'riverdashboard') { + $comment = elgg_get_excerpt($comment, 200); + if ($comment) { $string .= "
"; - if($comment){ - $contents = strip_tags($comment);//this is so we don't get large images etc in the activity river - if(strlen($contents) > 200) - $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "…"; - else - $string .= $contents; - } + $string .= $comment; $string .= "
"; } +} echo $string; \ No newline at end of file -- cgit v1.2.3