From 425c55726848136303479a8be6a8aec9e71ddbac Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 24 Feb 2007 11:03:41 +0000 Subject: [PATCH] do not rely on admin style for E_USER_ERROR messages git-svn-id: file:///svn/phpbb/trunk@7052 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6d9623245a..a6826e991f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1586,11 +1586,11 @@ function redirect($url, $return = false) echo ''; echo ''; echo ''; - echo ''; + echo ''; echo '' . $user->lang['REDIRECT'] . ''; echo ''; echo ''; - echo '
' . sprintf($user->lang['URL_REDIRECT'], '', '') . '
'; + echo '
' . sprintf($user->lang['URL_REDIRECT'], '', '') . '
'; echo ''; echo ''; @@ -1706,8 +1706,9 @@ function meta_refresh($time, $url) $url = redirect($url, true); + // For XHTML compatibility we change back & to & $template->assign_vars(array( - 'META' => '') + 'META' => '') ); } @@ -3271,33 +3272,38 @@ function msg_handler($errno, $msg_text, $errfile, $errline) garbage_collection(); + // Try to not call the adm page data... + echo ''; echo ''; echo ''; echo ''; echo '' . $msg_title . ''; - echo ''; + echo ''; echo ''; echo ''; echo '
'; echo '
'; echo ' Return to forum index'; echo '
'; - echo '
'; - echo '
'; - echo ' '; - echo '
'; - echo '

General Error

'; + echo '
'; + echo '
'; + echo '

General Error

'; - echo '

' . $msg_text . '

'; + echo '

' . $msg_text . '

'; if (!empty($config['board_contact'])) { echo '

Please notify the board administrator or webmaster: ' . $config['board_contact'] . '

'; } - echo '
'; - echo ' '; echo '
'; echo '
'; echo '
';