diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 5f764e9ff5..0b050cf73d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -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');