#5348: Page handler passes title to non wg layout

diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 74da7f8280189182bb0071a770604beed6e8257d..f0ffa6b9ddcb180f12c10120b720b69c06d1b8a5 100644 (file)
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -12,7 +12,7 @@ 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');
 
@@ -65,7 +65,7 @@ function expages_page_handler($page, $handler) {
        $type = strtolower($handler);
 
        $title = elgg_echo("expages:$type");
-       $content = elgg_view_title($title);
+       $header = elgg_view_title($title);
 
        $object = elgg_get_entities(array(
                'type' => 'object',
@@ -80,11 +80,11 @@ function expages_page_handler($page, $handler) {
        $content = elgg_view('expages/wrapper', array('content' => $content));
 
        if (elgg_is_logged_in() || !elgg_get_config('walled_garden')) {
-               $body = elgg_view_layout('one_sidebar', array('content' => $content));
+               $body = elgg_view_layout('one_sidebar', array('title' => $title, 'content' => $content));
                echo elgg_view_page($title, $body);
        } else {
                elgg_load_css('elgg.walled_garden');
-               $body = elgg_view_layout('walled_garden', array('content' => $content));
+               $body = elgg_view_layout('walled_garden', array('content' => $header . $content));
                echo elgg_view_page($title, $body, 'walled_garden');
        }
        return true;