diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
| commit | ea0140d87534c3b10e489d13a1449ebb79da832d (patch) | |
| tree | 85667ae651bc5cc9f0ea01c6f3871bbdee36a469 /mod/bookmarks | |
| parent | 157117475338bcaab5fc3453ec54250343da595c (diff) | |
| parent | 671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (diff) | |
| download | elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.gz elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.bz2 | |
Merge branch 'lorea-preprod'
Diffstat (limited to 'mod/bookmarks')
| -rw-r--r-- | mod/bookmarks/pages/bookmarks/view.php | 4 | ||||
| -rw-r--r-- | mod/bookmarks/views/default/object/bookmarks.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php index 2439d2ee8..c819b8b41 100644 --- a/mod/bookmarks/pages/bookmarks/view.php +++ b/mod/bookmarks/pages/bookmarks/view.php @@ -6,6 +6,10 @@ */ $bookmark = get_entity(get_input('guid')); +if (!$bookmark) { + register_error(elgg_echo('noaccess')); + forward(''); +} $page_owner = elgg_get_page_owner_entity(); diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 89a0d03e0..83bae2b13 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -27,7 +27,6 @@ $owner_link = elgg_view('output/url', array( )); $author_text = elgg_echo('byline', array($owner_link)); -$tags = elgg_view('output/tags', array('tags' => $bookmark->tags)); $date = elgg_view_friendly_time($bookmark->time_created); $comments_count = $bookmark->countComments(); @@ -64,7 +63,6 @@ if ($full && !elgg_in_context('gallery')) { 'title' => false, 'metadata' => $metadata, 'subtitle' => $subtitle, - 'tags' => $tags, ); $params = $params + $vars; $summary = elgg_view('object/elements/summary', $params); @@ -120,7 +118,6 @@ HTML; 'entity' => $bookmark, 'metadata' => $metadata, 'subtitle' => $subtitle, - 'tags' => $tags, 'content' => $content, ); $params = $params + $vars; |