aboutsummaryrefslogtreecommitdiff
path: root/views/default/river/annotation
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-24 07:32:27 -0400
committerCash Costello <cash.costello@gmail.com>2011-06-24 07:32:27 -0400
commit9edc8c6004d1236a21e03fb1c820a6e749f1ee3b (patch)
tree3defb2dc56e726c314b4d92d43744faf4d52bd48 /views/default/river/annotation
parent344e47862b1f39eca19e39a000f97f799cc87a12 (diff)
parent5e02fd697fd15ae857aa0c2969fd9ea92043a55a (diff)
downloadelgg-9edc8c6004d1236a21e03fb1c820a6e749f1ee3b.tar.gz
elgg-9edc8c6004d1236a21e03fb1c820a6e749f1ee3b.tar.bz2
Merge pull request #35 - Fixes #3404, #3490
Diffstat (limited to 'views/default/river/annotation')
-rw-r--r--views/default/river/annotation/generic_comment/create.php27
1 files changed, 4 insertions, 23 deletions
diff --git a/views/default/river/annotation/generic_comment/create.php b/views/default/river/annotation/generic_comment/create.php
index aabb6a9c6..d3db68e41 100644
--- a/views/default/river/annotation/generic_comment/create.php
+++ b/views/default/river/annotation/generic_comment/create.php
@@ -5,26 +5,7 @@
$object = $vars['item']->getObjectEntity();
$comment = $vars['item']->getAnnotation();
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
- $title = elgg_echo('untitled');
-}
-$params = array(
- 'href' => $object->getURL(),
- 'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-$type_string = elgg_echo("river:commented:$type:$subtype");
-echo elgg_echo('river:generic_comment', array($type_string, $object_link));
-
-if ($comment) {
- $excerpt = elgg_get_excerpt($comment->value);
- echo '<div class="elgg-river-content">';
- echo $excerpt;
- echo '</div>';
-}
+echo elgg_view('river/item', array(
+ 'item' => $vars['item'],
+ 'message' => elgg_get_excerpt($comment->value),
+));