aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-09-21 14:50:23 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-09-21 14:50:23 +0000
commitf1ba6ec14130a5480653745b22de6a001112bddb (patch)
tree2ec0fba80900655965b1c6d88bf4aaa7c22e39a6 /views/default
parent59f01de10c6a581c074889b96fbe4698ccd47309 (diff)
downloadelgg-f1ba6ec14130a5480653745b22de6a001112bddb.tar.gz
elgg-f1ba6ec14130a5480653745b22de6a001112bddb.tar.bz2
New river code added to allow user comment to be pulled out and displayed
git-svn-id: http://code.elgg.org/elgg/trunk@3490 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/annotation/annotate.php23
1 files changed, 13 insertions, 10 deletions
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index dfff81e83..d2869536a 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -3,20 +3,23 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$object = get_entity($vars['item']->object_guid);
$url = $object->getURL();
+ $title = $object->title;
+ if(!$title)
+ $title = 'Untitled';
$subtype = get_subtype_from_id($object->subtype);
- $comment = $object->getAnnotations("generic_comment", 1, 0, "desc");
- foreach($comment as $c){
- $contents = $c->value;
- }
- $contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
+ //grab the annotation, if one exists
+ if($vars['item']->annotation_id != 0)
+ $comment = get_annotation($vars['item']->annotation_id)->value;
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
- $string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+ $string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>";
$string .= "<div class=\"river_content_display\">";
- if(strlen($contents) > 200) {
- $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
- }else{
- $string .= $contents;
+ 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 .= "</div>";
?>