2 files changed, 12 insertions, 4 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 015efa370f..931c84614a 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -56,8 +56,8 @@ if($board_config['gzip_compress'])
 // Parse and show the overall header.
 //
 $template->set_filenames(array(
-	"overall_header" => "overall_header.tpl",
-	"overall_footer" => "overall_footer.tpl"));
+	"overall_header" => "overall_header.tpl")
+);
 
 //
 // Generate logged in/logged out status
@@ -109,7 +109,7 @@ $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, s.session_logged_
 $result = $db->sql_query($sql);
 if(!$result)
 {
-	error_die(SQL_QUERY, "Couldn't obtain user/online information.", __LINE__, __FILE__);
+	message_die(GENERAL_ERROR, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
 }
 
 $logged_visible_online = 0;
@@ -161,7 +161,7 @@ if($userdata['session_logged_in'])
 	$result_pm = $db->sql_query($sql);
 	if(!$result_pm)
 	{
-		error_die(SQL_QUERY, "Couldn't obtain user/online information.", __LINE__, __FILE__);
+		message_die(GENERAL_MESSAGE, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
 	}
 	if($pm_result = $db->sql_fetchrow($result_pm))
 	{
diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php
index 0d154a1df5..7913a1c697 100644
--- a/phpBB/includes/page_tail.php
+++ b/phpBB/includes/page_tail.php
@@ -30,6 +30,11 @@ if($userdata['user_level'] == ADMIN)
 	$admin_link = "<a href=\"admin/index.$phpEx\">Administration Panel</a>";
 }
 $current_time = time();
+
+$template->set_filenames(array(
+	"overall_footer" => "overall_footer.tpl")
+);
+
 $template->assign_vars(array(
 	"PHPBB_VERSION" => "2.0-alpha",
 	"ADMIN_LINK" => $admin_link));
@@ -59,6 +64,9 @@ printf("<center><font size=-2>phpBB Created this page in %f seconds.</font></cen
 //
 if($do_gzip_compress)
 {
+	//
+	// Borrowed from php.net!
+	//
 	$gzip_contents = ob_get_contents(); 
 	ob_end_clean();