diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-24 16:12:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-24 16:12:56 +0100 |
| commit | 2e3f89444a7bad3e723b4a990b7c1c1a46914c81 (patch) | |
| tree | c132bc6838ed6a34b34268e3a33e2d8b9031b2b6 /phpBB/includes/functions.php | |
| parent | ed21921c58c678844e39db87f0c487ce07acf8ab (diff) | |
| parent | 244d171cb035f0229ad2a06d01062ca809a72025 (diff) | |
| download | forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.gz forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.bz2 forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.xz forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.zip | |
Merge branch 'ticket/14136' into ticket/14136-3.2.x
Conflicts:
phpBB/adm/style/install_update_diff.html
phpBB/adm/style/installer_header.html
phpBB/install/database_update.php
phpBB/install/index.php
phpBB/styles/subsilver2/template/overall_header.html
phpBB/styles/subsilver2/template/simple_header.html
phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
phpBB/styles/subsilver2/template/viewtopic_print.html
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index c9f2601e31..c4f285c905 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1813,6 +1813,7 @@ function redirect($url, $return = false, $disable_cd_check = false) echo '<html dir="' . $user->lang['DIRECTION'] . '" lang="' . $user->lang['USER_LANG'] . '">'; echo '<head>'; echo '<meta charset="utf-8">'; + echo '<meta http-equiv="X-UA-Compatible" content="IE=edge">'; echo '<meta http-equiv="refresh" content="0; url=' . str_replace('&', '&', $url) . '" />'; echo '<title>' . $user->lang['REDIRECT'] . '</title>'; echo '</head>'; @@ -3322,6 +3323,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) echo '<html dir="ltr">'; echo '<head>'; echo '<meta charset="utf-8">'; + echo '<meta http-equiv="X-UA-Compatible" content="IE=edge">'; echo '<title>' . $msg_title . '</title>'; echo '<style type="text/css">' . "\n" . '/* <![CDATA[ */' . "\n"; echo '* { margin: 0; padding: 0; } html { font-size: 100%; height: 100%; margin-bottom: 1px; background-color: #E4EDF0; } body { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; color: #536482; background: #E4EDF0; font-size: 62.5%; margin: 0; } '; |