Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 15 insertions, 1 deletions

diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 1de4d5ec8..13235af53 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -12,6 +12,9 @@ function expages_init() {
 	elgg_register_page_handler('terms', 'expages_page_handler');
 	elgg_register_page_handler('privacy', 'expages_page_handler');
 	elgg_register_page_handler('expages', 'expages_page_handler');
+	
+	// Register public external pages
+	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'expages_public');
 
 	// add a menu item for the admin edit page
 	elgg_register_admin_menu_item('configure', 'expages', 'appearance');
@@ -25,6 +28,15 @@ function expages_init() {
 }
 
 /**
+ * Extend the public pages range
+ *
+ */
+function expages_public($hook, $handler, $return, $params){
+	$pages = array('about', 'terms', 'privacy');
+	return array_merge($pages, $return);
+}
+
+/**
  * Setup the links to site pages
  */
 function expages_setup_footer_menu() {
@@ -32,7 +44,7 @@ function expages_setup_footer_menu() {
 	foreach ($pages as $page) {
 		$url = "$page";
 		$item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url);
-		elgg_register_menu_item('footer', $item);
+		elgg_register_menu_item('walled_garden', $item);
 	}
 }
 
@@ -41,6 +53,7 @@ function expages_setup_footer_menu() {
  *
  * @param array  $page    URL segements
  * @param string $handler Handler identifier
+ * @return bool
  */
 function expages_page_handler($page, $handler) {
 	if ($handler == 'expages') {
@@ -64,6 +77,7 @@ function expages_page_handler($page, $handler) {
 
 	$body = elgg_view_layout("one_sidebar", array('content' => $content));
 	echo elgg_view_page($title, $body);
+	return true;
 }
 
 /**