Regression: Fix undefined offset: 1 (#17139)

* Fix undefined offset: 1 * Fix undefined offset: 1
joomla · Aug 12, 2017 · 4a5a043 · 4a5a043
1 parent c1d93d8
commit 4a5a043
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/libraries/src/Environment/Browser.php b/libraries/src/Environment/Browser.php
@@ -279,7 +279,9 @@ public function match($userAgent = null, $accept = null)
 
 				list ($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
 			}
-			elseif (preg_match('/Chrome[\/ ]([0-9.]+)|CrMo[\/ ]([0-9.]+)|CriOS[\/ ]([0-9.]+)/i', $this->agent, $version))
+			elseif (preg_match('/Chrome[\/ ]([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/CrMo[\/ ]([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/CriOS[\/ ]([0-9.]+)/i', $this->agent, $version))
 			{
 				$this->setBrowser('chrome');
 
@@ -291,7 +293,10 @@ public function match($userAgent = null, $accept = null)
 			{
 				$this->setBrowser('palm');
 			}
-			elseif ((preg_match('/MSIE ([0-9.]+)|Internet Explorer\/([0-9.]+)|Trident\/([0-9.]+)/i', $this->agent, $version)))
+			elseif (preg_match('/MSIE ([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/IE ([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/Internet Explorer[\/ ]([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/Trident\/.*rv:([0-9.]+)/i', $this->agent, $version))
 			{
 				$this->setBrowser('msie');