L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm25_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2013-12-10 09:20:17 +13:00
parent 0da3aac317 5a575d8487
commit 69a40654d8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputrenderers.php
+3 -3
View File
@@ -3354,16 +3354,16 @@ class core_renderer_ajax extends core_renderer {
*/
public function header() {
// MDL-39810: IE doesn't support JSON MIME type if version < 8 or when it runs in Compatibility View.
$supports_json_contenttype = !check_browser_version('MSIE') ||
$supportsjsoncontenttype = !check_browser_version('MSIE') ||
(check_browser_version('MSIE', 8) &&
!(preg_match("/MSIE 7.0/", $_SERVER['HTTP_USER_AGENT']) && preg_match("/Trident\/([0-9\.]+)/", $_SERVER['HTTP_USER_AGENT'])));
// unfortunately YUI iframe upload does not support application/json
if (!empty($_FILES)) {
@header('Content-type: text/plain; charset=utf-8');
if (!$supports_json_contenttype) {
if (!$supportsjsoncontenttype) {
@header('X-Content-Type-Options: nosniff');
}
} else if (!$supports_json_contenttype) {
} else if (!$supportsjsoncontenttype) {
@header('Content-type: text/plain; charset=utf-8');
@header('X-Content-Type-Options: nosniff');
} else {