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

This commit is contained in:
Sam Hemelryk
2013-12-10 09:20:33 +13:00
+3 -3
View File
@@ -500,17 +500,17 @@ class core_useragent {
} else {
return false;
}
$compat_view = false;
$compatview = false;
// IE8 and later versions may pretend to be IE7 for intranet sites, use Trident version instead,
// the Trident should always describe the capabilities of IE in any emulation mode.
if ($browser === '7.0' and preg_match("/Trident\/([0-9\.]+)/", $useragent, $match)) {
$compat_view = true;
$compatview = true;
$browser = $match[1] + 4; // NOTE: Hopefully this will work also for future IE versions.
}
$browser = round($browser, 1);
return array(
'version' => $browser,
'compatview' => $compat_view
'compatview' => $compatview
);
}