diff options
| -rw-r--r-- | mod/bookmarks/languages/en.php | 1 | ||||
| -rw-r--r-- | mod/bookmarks/views/default/river/object/bookmarks/create.php | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php index e73486e5d..6bdf565ad 100644 --- a/mod/bookmarks/languages/en.php +++ b/mod/bookmarks/languages/en.php @@ -14,6 +14,7 @@ $english = array( 'bookmarks:user' => "%s's bookmarks", 'bookmarks:group' => "Bookmarks", 'bookmarks:this' => "Bookmark this", + 'bookmarks:ingroup' => "in the group", 'bookmarks:this:group' => "Bookmark in %s", 'bookmarks:bookmarklet' => "Get bookmarklet", 'bookmarks:bookmarklet:group' => "Get community bookmarklet", diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php index ba1c24572..d5124e4ca 100644 --- a/mod/bookmarks/views/default/river/object/bookmarks/create.php +++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php @@ -5,10 +5,15 @@ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $object = get_entity($vars['item']->object_guid); +$is_group = get_entity($object->container_guid); $url = $object->getURL(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $string = sprintf(elgg_echo("bookmarks:river:created"),$url) . " "; -$string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_updated) . "</span>"; +$string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>"; +if(($is_group instanceof ElggGroup) && (get_context() != 'groups')){ + $string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>"; +} +$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span>"; if (isloggedin()){ $string .= "<a class='river_comment_form_button link'>Comment</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); |