aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-24 18:00:15 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-24 18:00:15 +0100
commit3a23068d897d1298da53945dfeaf4aa890d38230 (patch)
tree36ac05fd51c550a1d2810be7fd6ee6a9c3be7886 /phpBB/includes
parentdcb6154be7e7f8afcecb17c89dce8841d56dd0af (diff)
parent244d171cb035f0229ad2a06d01062ca809a72025 (diff)
downloadforums-3a23068d897d1298da53945dfeaf4aa890d38230.tar
forums-3a23068d897d1298da53945dfeaf4aa890d38230.tar.gz
forums-3a23068d897d1298da53945dfeaf4aa890d38230.tar.bz2
forums-3a23068d897d1298da53945dfeaf4aa890d38230.tar.xz
forums-3a23068d897d1298da53945dfeaf4aa890d38230.zip
Merge pull request #4242 from marc1706/ticket/14136
[ticket/14136] Add back X-UA-Compatible meta tag * marc1706/ticket/14136: [ticket/14136] Add back X-UA-Compatible meta tag
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
-rw-r--r--phpBB/includes/functions_download.php1
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 72c0d458c6..8e3f62230a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2401,6 +2401,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('&', '&amp;', $url) . '" />';
echo '<title>' . $user->lang['REDIRECT'] . '</title>';
echo '</head>';
@@ -3997,6 +3998,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; } ';
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index 254e65ae3d..328be93046 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -108,6 +108,7 @@ function wrap_img_in_html($src, $title)
echo '<html>';
echo '<head>';
echo '<meta charset="utf-8">';
+ echo '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
echo '<title>' . $title . '</title>';
echo '</head>';
echo '<body>';