a snippet of a new comment on an object will now appear in the activity river

git-svn-id: https://code.elgg.org/elgg/trunk@3444 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 7888f76d257aea013c8d045f941d7a72025ce6b8..f5ccac36eeed87fd18b017bd587b3501763516c5 100644 (file)
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -4,11 +4,21 @@
        $object = get_entity($vars['item']->object_guid);\r
        $url = $object->getURL();\r
        $subtype = get_subtype_from_id($object->subtype);\r
-\r
+       $comment = $object->getAnnotations("generic_comment", 1, 0, "desc"); \r
+       foreach($comment as $c){\r
+               $contents = $c->value;\r
+       }\r
+       $contents = strip_tags($contents);//this is so we don't get large images etc in the activity river\r
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";\r
        $string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";\r
        $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";\r
-\r
+       $string .= "<div class=\"river_content_display\">";\r
+       if(strlen($contents) > 200) {\r
+               $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";\r
+    }else{\r
+           $string .= $contents;\r
+    }\r
+       $string .= "</div>";\r
 ?>\r
 \r
 <?php echo $string; ?>
\ No newline at end of file