aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--languages/en.php2
-rw-r--r--mod/blog/lib/blog.php5
-rw-r--r--mod/bookmarks/pages/bookmarks/view.php1
-rw-r--r--mod/file/pages/file/view.php1
-rw-r--r--mod/groups/lib/discussion.php5
-rw-r--r--mod/pages/pages/pages/view.php3
-rw-r--r--mod/thewire/pages/thewire/view.php1
7 files changed, 12 insertions, 6 deletions
diff --git a/languages/en.php b/languages/en.php
index 03e6dfa84..64c95b866 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -235,7 +235,7 @@ $english = array(
'pageownerunavailable' => 'Warning: The page owner %d is not accessible!',
'viewfailure' => 'There was an internal failure in the view %s',
'changebookmark' => 'Please change your bookmark for this page',
- 'noaccess' => 'The content you were trying to view has been removed or you do not have permission to view it.',
+ 'noaccess' => 'You need to login to view this content or the content has been removed or you do not have permission to view it.',
'error:missing_data' => 'There was some data missing in your request',
'error:default' => 'Oops...something went wrong.',
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 43de7a646..9a02a8cc3 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -22,8 +22,9 @@ function blog_get_page_content_read($guid = NULL) {
$return['filter'] = '';
if (!elgg_instanceof($blog, 'object', 'blog')) {
- $return['content'] = elgg_echo('noaccess');
- return $return;
+ register_error(elgg_echo('noaccess'));
+ $_SESSION['last_forward_from'] = current_page_url();
+ forward('');
}
$return['title'] = $blog->title;
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index c819b8b41..70a6a5bfe 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -8,6 +8,7 @@
$bookmark = get_entity(get_input('guid'));
if (!$bookmark) {
register_error(elgg_echo('noaccess'));
+ $_SESSION['last_forward_from'] = current_page_url();
forward('');
}
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index ec51b30e6..6c9566a89 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -8,6 +8,7 @@
$file = get_entity(get_input('guid'));
if (!$file) {
register_error(elgg_echo('noaccess'));
+ $_SESSION['last_forward_from'] = current_page_url();
forward('');
}
diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 55642644d..02ab27fdc 100644
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -149,8 +149,9 @@ function discussion_handle_view_page($guid) {
$topic = get_entity($guid);
if (!$topic) {
- register_error(elgg_echo('discussion:topic:notfound'));
- forward();
+ register_error(elgg_echo('noaccess'));
+ $_SESSION['last_forward_from'] = current_page_url();
+ forward('');
}
$group = $topic->getContainerEntity();
diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index 6b9d03f49..e1c3fdbfd 100644
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -9,7 +9,8 @@ $page_guid = get_input('guid');
$page = get_entity($page_guid);
if (!$page) {
register_error(elgg_echo('noaccess'));
- forward();
+ $_SESSION['last_forward_from'] = current_page_url();
+ forward('');
}
elgg_set_page_owner_guid($page->getContainerGUID());
diff --git a/mod/thewire/pages/thewire/view.php b/mod/thewire/pages/thewire/view.php
index 1818e725a..1709e5e9a 100644
--- a/mod/thewire/pages/thewire/view.php
+++ b/mod/thewire/pages/thewire/view.php
@@ -6,6 +6,7 @@
$post = get_entity(get_input('guid'));
if (!$post) {
register_error(elgg_echo('noaccess'));
+ $_SESSION['last_forward_from'] = current_page_url();
forward('');
}
$owner = $post->getOwnerEntity();