Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-31482-m22' of git://github.com/sammarshallou/moodle…

… into MOODLE_22_STABLE
  • Loading branch information...
commit 822790437e29fb4ac15ac8cf4b6c622c4a0a8a91 2 parents 76456cf + e455406
@nebgor nebgor authored
Showing with 11 additions and 1 deletion.
  1. +2 −1  lib/moodlelib.php
  2. +9 −0 lib/simpletest/testmoodlelib.php
View
3  lib/moodlelib.php
@@ -8212,7 +8212,8 @@ function get_device_type() {
return 'tablet';
}
- if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6.') !== false) {
+ // Safe way to check for IE6 and not get false positives for some IE 7/8 users
+ if (substr($_SERVER['HTTP_USER_AGENT'], 0, 34) === 'Mozilla/4.0 (compatible; MSIE 6.0;') {
return 'legacy';
}
View
9 lib/simpletest/testmoodlelib.php
@@ -296,6 +296,15 @@ function test_get_browser_version_classes() {
$this->assertEqual(array('gecko', 'gecko19'), get_browser_version_classes());
}
+ function test_get_device_type() {
+ // IE8 (common pattern ~1.5% of IE7/8 users have embedded IE6 agent))
+ $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; BT Openworld BB; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; Hotbar 10.2.197.0; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727)';
+ $this->assertEqual('default', get_device_type());
+ // Genuine IE6
+ $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1; SV1; FunWebProducts; .NET CLR 1.0.3705; Media Center PC 2.8)';
+ $this->assertEqual('legacy', get_device_type());
+ }
+
function test_fix_utf8() {
// make sure valid data including other types is not changed
$this->assertidentical(null, fix_utf8(null));
Please sign in to comment.
Something went wrong with that request. Please try again.