diff options
author | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
---|---|---|
committer | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
commit | a3a03a721f62bcf1426a475a543b0b1fcd322bcf (patch) | |
tree | 4e6349bcf673d21e7513381b9acd1f832654fc02 /views/default/river/annotation | |
parent | 344e47862b1f39eca19e39a000f97f799cc87a12 (diff) | |
parent | cf85a49c7e74133feaec7d52d8f289d22b59a56c (diff) | |
download | elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.gz elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.bz2 |
Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow-3404-river-revamp
Conflicts:
languages/en.php
Diffstat (limited to 'views/default/river/annotation')
-rw-r--r-- | views/default/river/annotation/generic_comment/create.php | 27 |
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), +)); |