4 files changed, 9 insertions, 7 deletions
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index dfc521e11..6990bd6b0 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -9,7 +9,7 @@
 	<description>Elgg Pages</description>
 	<website>http://www.elgg.org</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/pages/pages/pages/edit.php b/mod/pages/pages/pages/edit.php
index 6f54d72bf..1f411b94d 100644
--- a/mod/pages/pages/pages/edit.php
+++ b/mod/pages/pages/pages/edit.php
@@ -10,12 +10,14 @@ gatekeeper();
 $page_guid = (int)get_input('guid');
 $page = get_entity($page_guid);
 if (!$page) {
-	
+	register_error(elgg_echo('noaccess'));
+	forward('');
 }
 
 $container = $page->getContainerEntity();
 if (!$container) {
-	
+	register_error(elgg_echo('noaccess'));
+	forward('');
 }
 
 elgg_set_page_owner_guid($container->getGUID());
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 744306649..b2f26c719 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -100,6 +100,7 @@ function pages_init() {
  * Title is ignored
  *
  * @param array $page
+ * @return bool
  */
 function pages_page_handler($page) {
 
@@ -149,12 +150,12 @@ function pages_page_handler($page) {
 			include "$base_dir/revision.php";
 			break;
 		case 'all':
-		default:
 			include "$base_dir/world.php";
 			break;
+		default:
+			return false;
 	}
-
-	return;
+	return true;
 }
 
 /**
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 0a1c33458..e78289f28 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -80,7 +80,6 @@ if ($full) {
 
 	$params = array(
 		'entity' => $page,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,