9 files changed, 23 insertions, 2 deletions
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index f24e6f58d..41924f336 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -124,6 +124,9 @@ function blog_get_page_content_list($container_guid = NULL) {
 function blog_get_page_content_friends($user_guid) {
 
 	$user = get_user($user_guid);
+	if (!$user) {
+		forward('blog/all');
+	}
 
 	$return = array();
 
diff --git a/mod/bookmarks/pages/bookmarks/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index 3491090a5..be164fcec 100644
--- a/mod/bookmarks/pages/bookmarks/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -6,6 +6,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('bookmarks/all');
+}
 
 elgg_push_breadcrumb($owner->name, "bookmarks/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
diff --git a/mod/bookmarks/pages/bookmarks/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
index 679c986be..7f55e08de 100644
--- a/mod/bookmarks/pages/bookmarks/owner.php
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -6,6 +6,9 @@
  */
 
 $page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('bookmarks/all');
+}
 
 elgg_push_breadcrumb($page_owner->name);
 
diff --git a/mod/file/pages/file/friends.php b/mod/file/pages/file/friends.php
index 0b351efaf..f504bdc1f 100644
--- a/mod/file/pages/file/friends.php
+++ b/mod/file/pages/file/friends.php
@@ -6,6 +6,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('file/all');
+}
 
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index 4e2ec89d4..fb87af1b2 100644
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -9,6 +9,9 @@
 group_gatekeeper();
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('file/all');
+}
 
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name);
diff --git a/mod/pages/pages/pages/friends.php b/mod/pages/pages/pages/friends.php
index c55b27466..87ac631c2 100644
--- a/mod/pages/pages/pages/friends.php
+++ b/mod/pages/pages/pages/friends.php
@@ -7,7 +7,7 @@
 
 $owner = elgg_get_page_owner_entity();
 if (!$owner) {
-
+	forward('pages/all');
 }
 
 elgg_push_breadcrumb($owner->name, "pages/owner/$owner->username");
diff --git a/mod/pages/pages/pages/owner.php b/mod/pages/pages/pages/owner.php
index 2ff310ac8..2ff45ae0c 100644
--- a/mod/pages/pages/pages/owner.php
+++ b/mod/pages/pages/pages/owner.php
@@ -7,7 +7,7 @@
 
 $owner = elgg_get_page_owner_entity();
 if (!$owner) {
-
+	forward('pages/all');
 }
 
 // access check for closed groups
diff --git a/mod/thewire/pages/thewire/friends.php b/mod/thewire/pages/thewire/friends.php
index 265b73eab..26ad03da6 100644
--- a/mod/thewire/pages/thewire/friends.php
+++ b/mod/thewire/pages/thewire/friends.php
@@ -4,6 +4,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('thewire/all');
+}
 
 $title = elgg_echo('thewire:friends');
 
diff --git a/mod/thewire/pages/thewire/owner.php b/mod/thewire/pages/thewire/owner.php
index b6449b217..a95786b0a 100644
--- a/mod/thewire/pages/thewire/owner.php
+++ b/mod/thewire/pages/thewire/owner.php
@@ -5,6 +5,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('thewire/all');
+}
 
 $title = elgg_echo('thewire:user', array($owner->name));