From 53a6857b021b42835709b11e2287d11986d8b2c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 9 Jun 2009 19:15:11 +0000 Subject: [PATCH] Footer is back on in installation phase, fix for strange error message from header() --- inc/footer.php | 2 +- inc/wrapper-functions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/footer.php b/inc/footer.php index 68432f83c4..e691b2ce62 100644 --- a/inc/footer.php +++ b/inc/footer.php @@ -53,7 +53,7 @@ if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != '1') && } // END - if // Shall we display the copyright notice? - if ((!REQUEST_ISSET_GET('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && (getConfig('WRITE_FOOTER') == 'Y') && ($GLOBALS['header_sent'] == '2')) { + if ((!REQUEST_ISSET_GET('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == '2')) { // Backlink enabled? if ((getConfig('ENABLE_BACKLINK') == 'Y') || (isInstalling())) { // Copyright with backlink, thanks! :-) diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 3b3b9b2927..54ffb3db3a 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -378,7 +378,7 @@ function sendHeader ($header) { } // END - if // Send the header - header($header); + header(trim($header)); } // Wrapper function for chmod() -- 2.39.5