Fixes #4496, #4500 Refs #2814 Add consistent error message when content does not...

diff --git a/languages/en.php b/languages/en.php
index f1de1f20273c51e656b43076543e169b913158e6..ae874a550c44debcad87005ea4bc21c3f9251fd2 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -239,7 +239,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' => 'This content has been removed, is invalid, or you do not have permission to view it.',
+       'noaccess' => 'The content you were trying to view 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/languages/en.php b/mod/blog/languages/en.php
index e1930b9165eb54837120f0d46af78710d2b3b427..5248a6f5175e0c5d7b91919c0b3f786d4f0b0c30 100644 (file)
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -41,7 +41,6 @@ $english = array(
        'blog:message:saved' => 'Blog post saved.',
        'blog:error:cannot_save' => 'Cannot save blog post.',
        'blog:error:cannot_write_to_container' => 'Insufficient access to save blog to group.',
-       'blog:error:post_not_found' => 'This post has been removed, is invalid, or you do not have permission to view it.',
        'blog:messages:warning:draft' => 'There is an unsaved draft of this post!',
        'blog:edit_revision_notice' => '(Old version)',
        'blog:message:deleted_post' => 'Blog post deleted.',

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 286fe1832802b5414101f058a52457166f4bcd72..9d6cb37e7a31d34559ffbdc2674dcdc2d252992e 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -22,7 +22,7 @@ function blog_get_page_content_read($guid = NULL) {
        $return['filter'] = '';
 
        if (!elgg_instanceof($blog, 'object', 'blog')) {
-               $return['content'] = elgg_echo('blog:error:post_not_found');
+               $return['content'] = elgg_echo('noaccess');
                return $return;
        }
 

diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 2439d2ee8b80324e5b5435aaa0cb575cf0f91282..c819b8b41d14f40ff9fda39f27cfdd614223cd9d 100644 (file)
--- 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/file/pages/file/view.php b/mod/file/pages/file/view.php
index a571c9d68ea0a2af3669a59f6f1dfa23051eb626..ec51b30e67b8785089759e5d0650372395b8ecfa 100644 (file)
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -6,6 +6,10 @@
  */
 
 $file = get_entity(get_input('guid'));
+if (!$file) {
+       register_error(elgg_echo('noaccess'));
+       forward('');
+}
 
 $owner = elgg_get_page_owner_entity();
 

diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index 9bfd67a1236916ceff6f534649e19d93dd5cce20..6b9d03f494c59132500d0fdae276f0a0498cd378 100644 (file)
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -8,6 +8,7 @@
 $page_guid = get_input('guid');
 $page = get_entity($page_guid);
 if (!$page) {
+       register_error(elgg_echo('noaccess'));
        forward();
 }
 

diff --git a/mod/thewire/pages/thewire/view.php b/mod/thewire/pages/thewire/view.php
index f45f94bfee1fdc749e5b64aaed953365575aaec1..1818e725a274e045d8ee8d293f4e73cf8ef8adf5 100644 (file)
--- a/mod/thewire/pages/thewire/view.php
+++ b/mod/thewire/pages/thewire/view.php
@@ -5,8 +5,8 @@
 
 $post = get_entity(get_input('guid'));
 if (!$post) {
-       // @todo need special handling for not getting access to entity (check for existence, access)
-       forward();
+       register_error(elgg_echo('noaccess'));
+       forward('');
 }
 $owner = $post->getOwnerEntity();
 if (!$owner) {