From 791922735fa7ebdb3baf11dda5e6e31885b3b27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 10 Nov 2012 11:47:09 +0100 Subject: [PATCH] MDL-36487 do not use IE=edge header on pages that have custom X-UA-Compatible Thanks Dan Poltawski for spotting this regression! --- lib/weblib.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/weblib.php b/lib/weblib.php index 95e7fe6303c..8bdf838c9bc 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -1848,7 +1848,10 @@ function send_headers($contenttype, $cacheable = true) { @header('Content-Type: ' . $contenttype); @header('Content-Script-Type: text/javascript'); @header('Content-Style-Type: text/css'); - @header('X-UA-Compatible: IE=edge'); + + if (empty($CFG->additionalhtmlhead) or stripos($CFG->additionalhtmlhead, 'X-UA-Compatible') === false) { + @header('X-UA-Compatible: IE=edge'); + } if ($cacheable) { // Allow caching on "back" (but not on normal clicks)