gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Browse Source
This commit is contained in:
Weblate 2013-03-26 12:49:38 +01:00
commit 8a2fcbd771
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/Config.class.php
View File

@ -217,6 +217,7 @@ class PMA_Config
) {
$this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]);
$this->set('PMA_USR_BROWSER_AGENT', 'CHROME');
// newer Safari
} elseif (preg_match(
'@Mozilla/([0-9].[0-9]{1,2})@',
$HTTP_USER_AGENT,
@ -224,6 +225,19 @@ class PMA_Config
&& preg_match('@Version/(.*) Safari@', $HTTP_USER_AGENT, $log_version2)
) {
$this->set('PMA_USR_BROWSER_VER', $log_version2[1]);
$this->set('PMA_USR_BROWSER_AGENT', 'CHROME');
// older Safari
} elseif (preg_match(
'@Mozilla/([0-9].[0-9]{1,2})@',
$HTTP_USER_AGENT,
$log_version)
&& preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)
) {
$this->set('PMA_USR_BROWSER_VER',
$log_version[1]
. '.'
. $log_version2[1]
);
$this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
} elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) {
$this->set('PMA_USR_BROWSER_VER', '1.9');