From 2d61fca50b21d7536bead7f833c716b8009c60a8 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 11 Mar 2008 12:22:09 +0000
Subject: The pageshell now correctly passes elements to the header, footer
 etc.

git-svn-id: https://code.elgg.org/elgg/trunk@159 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php                 | 4 +---
 views/default/pageshell.php            | 1 +
 views/default/pageshells/pageshell.php | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e38288ac1..a561172f1 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -53,9 +53,8 @@
 	 * @return string The HTML content
 	 */
 		function elgg_view($view, $vars = "", $viewtype = "", $debug = false) {
-		
+
 		    global $CONFIG, $strings;
-		    
 		    static $usercache;
 		    if (!is_array($usercache)) {
 		        $usercache = array();
@@ -99,7 +98,6 @@
 		    } else {
 		    	$viewlist = array(500 => $view);
 		    }
-		    
 		    ob_start();
 		    foreach($viewlist as $priority => $view) {
 		    
diff --git a/views/default/pageshell.php b/views/default/pageshell.php
index 64e65df1a..002f41e9b 100644
--- a/views/default/pageshell.php
+++ b/views/default/pageshell.php
@@ -18,6 +18,7 @@
 	 */
 
 	// Set title
+
 		if (empty($vars['title'])) {
 			$title = $vars['sitename'];
 		} else if (empty($vars['sitename'])) {
diff --git a/views/default/pageshells/pageshell.php b/views/default/pageshells/pageshell.php
index 9250f955a..2455db5b3 100644
--- a/views/default/pageshells/pageshell.php
+++ b/views/default/pageshells/pageshell.php
@@ -29,7 +29,7 @@
 ?>
 
 <!-- include the header -->
-<?php echo elgg_view('page_elements/header'); ?>
+<?php echo elgg_view('page_elements/header', $vars); ?>
 
     <!-- main contents -->
     
@@ -38,7 +38,7 @@
     
     <!-- toolbox -->
     <div id="sidebar_toolbox">
-        <?php echo elgg_view("navigation/toolbox"); ?><!-- include the my world toolbox -->
+        <?php echo elgg_view("navigation/toolbox", $vars); ?><!-- include the my world toolbox -->
     </div>
     
     <!-- get the main body -->
@@ -47,4 +47,4 @@
     </div>
 
 <!-- include the footer -->
-<?php echo elgg_view('page_elements/footer'); ?>
\ No newline at end of file
+<?php echo elgg_view('page_elements/footer', $vars); ?>
\ No newline at end of file
-- 
cgit v1.2.3