aboutsummaryrefslogtreecommitdiff
path: root/mod/bookmarks
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 /mod/bookmarks
parent344e47862b1f39eca19e39a000f97f799cc87a12 (diff)
parent5e02fd697fd15ae857aa0c2969fd9ea92043a55a (diff)
downloadelgg-9edc8c6004d1236a21e03fb1c820a6e749f1ee3b.tar.gz
elgg-9edc8c6004d1236a21e03fb1c820a6e749f1ee3b.tar.bz2
Merge pull request #35 - Fixes #3404, #3490
Diffstat (limited to 'mod/bookmarks')
-rw-r--r--mod/bookmarks/languages/en.php4
-rw-r--r--mod/bookmarks/views/default/river/object/bookmarks/create.php31
2 files changed, 7 insertions, 28 deletions
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 42865f8cf..1d32a0344 100644
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -35,10 +35,10 @@ $english = array(
'bookmarks:visit' => "Visit resource",
'bookmarks:recent' => "Recent bookmarks",
- 'bookmarks:river:created' => 'bookmarked %s',
+ 'river:create:object:bookmarks' => '%s bookmarked %s',
+ 'river:comment:object:bookmarks' => '%s commented on a bookmark %s',
'bookmarks:river:annotate' => 'a comment on this bookmark',
'bookmarks:river:item' => 'an item',
- 'river:commented:object:bookmarks' => 'a bookmark',
'item:object:bookmarks' => 'Bookmarks',
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 743efdb22..984d109be 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -8,29 +8,8 @@
$object = $vars['item']->getObjectEntity();
$excerpt = elgg_get_excerpt($object->description);
-$params = array(
- 'href' => $object->getURL(),
- 'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
- $params = array(
- 'href' => $container->getURL(),
- 'text' => $container->name,
- );
- $group_link = elgg_view('output/url', $params);
- $group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-$link = elgg_echo('bookmarks:river:created', array($link));
-
-echo " $link $group_string";
-
-if ($excerpt) {
- echo '<div class="elgg-river-content">';
- echo $excerpt;
- echo '</div>';
-}
+echo elgg_view('river/item', array(
+ 'item' => $vars['item'],
+ 'message' => $excerpt,
+ 'attachments' => elgg_view('output/url', array('href' => $object->address)),
+));