moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-50812-master' of https://github.com/nashtechdev01/moodle

Browse source
This commit is contained in:
David Monllao 2018-06-05 11:51:09 +02:00 • committed by Eloy Lafuente (stronk7)
commit 75ebfbdf99
6 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/classes/useragent.php
View file

@ -910,7 +910,9 @@ class core_useragent {
*/
public static function get_browser_version_classes() {
$classes = array();
if (self::is_ie()) {
if (self::is_edge()) {
$classes[] = 'edge';
} else if (self::is_ie()) {
$classes[] = 'ie';
for ($i = 12; $i >= 6; $i--) {
if (self::check_ie_version($i)) {
@ -923,12 +925,19 @@ class core_useragent {
if (preg_match('/rv\:([1-2])\.([0-9])/', self::get_user_agent_string(), $matches)) {
$classes[] = "gecko{$matches[1]}{$matches[2]}";
}
} else if (self::is_chrome()) {
$classes[] = 'chrome';
if (self::is_webkit_android()) {
$classes[] = 'android';
}
} else if (self::is_webkit()) {
$classes[] = 'safari';
if (self::is_safari()) {
$classes[] = 'safari';
}
if (self::is_safari_ios()) {
$classes[] = 'ios';
} else if (self::is_webkit_android()) {
$classes[] = 'android';
$classes[] = 'android'; // Old pre-Chrome android browsers.
}
} else if (self::is_opera()) {
$classes[] = 'opera';

25
lib/tests/useragent_test.php
View file

@ -64,7 +64,7 @@ class core_useragent_testcase extends advanced_testcase {
),
'versionclasses' => array(
'safari',
'edge',
),
),
),
@ -97,8 +97,7 @@ class core_useragent_testcase extends advanced_testcase {
),
'versionclasses' => array(
'safari',
'android',
'edge'
),
'devicetype' => 'mobile',
@ -898,8 +897,7 @@ class core_useragent_testcase extends advanced_testcase {
'is_webkit' => true,
'versionclasses' => array(
'safari',
'ios',
'ios'
),
'devicetype' => 'mobile',
@ -922,7 +920,6 @@ class core_useragent_testcase extends advanced_testcase {
'is_webkit' => true,
'versionclasses' => array(
'safari',
'ios',
),
@ -944,7 +941,6 @@ class core_useragent_testcase extends advanced_testcase {
'is_webkit' => true,
'versionclasses' => array(
'safari',
'ios',
),
@ -953,7 +949,7 @@ class core_useragent_testcase extends advanced_testcase {
),
// Android WebKit 525; G1 Phone.
array(
'Android WebKit 525; G1 Phone' => array(
'Mozilla/5.0 (Linux; U; Android 1.1; en-gb; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2 – G1 Phone',
array(
'is_webkit_android' => true,
@ -965,7 +961,6 @@ class core_useragent_testcase extends advanced_testcase {
'versionclasses' => array(
'android',
'safari',
),
'devicetype' => 'mobile',
@ -975,7 +970,7 @@ class core_useragent_testcase extends advanced_testcase {
),
// Android WebKit 530; Nexus.
array(
'Android WebKit 530; Nexus' => array(
'Mozilla/5.0 (Linux; U; Android 2.1; en-us; Nexus One Build/ERD62) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17 –Nexus',
array(
'is_webkit_android' => true,
@ -988,7 +983,6 @@ class core_useragent_testcase extends advanced_testcase {
'versionclasses' => array(
'android',
'safari',
),
'devicetype' => 'mobile',
@ -1017,7 +1011,7 @@ class core_useragent_testcase extends advanced_testcase {
),
'versionclasses' => array(
'safari',
'chrome',
'android',
),
@ -1045,7 +1039,7 @@ class core_useragent_testcase extends advanced_testcase {
),
'versionclasses' => array(
'safari',
'chrome',
'android',
),
@ -1066,7 +1060,7 @@ class core_useragent_testcase extends advanced_testcase {
'is_webkit' => true,
'versionclasses' => array(
'safari',
'chrome',
),
),
),
@ -1086,7 +1080,7 @@ class core_useragent_testcase extends advanced_testcase {
'is_webkit' => true,
'versionclasses' => array(
'safari',
'chrome',
),
),
),
@ -1231,7 +1225,6 @@ class core_useragent_testcase extends advanced_testcase {
),
'versionclasses' => array(
'safari',
'ios',
),