Преглед изворни кода

Fixes #550 - Zend_Http_UserAgent_AbstractDevice undefined index

Frank Brückner пре 10 година
родитељ
комит
c2f2bfee63

+ 3 - 1
library/Zend/Http/UserAgent/AbstractDevice.php

@@ -509,7 +509,9 @@ abstract class Zend_Http_UserAgent_AbstractDevice
                 }
                 $result['browser_version'] = '??';
             }
-        } elseif ($product == 'mozilla' && $result['browser_version'] < 5.0) {
+        } elseif ($product == 'mozilla' && isset($result['browser_version'])
+                  && $result['browser_version'] < 5.0
+        ) {
             // handles the real Mozilla (or old Netscape if version < 5.0)
             $result['browser_name'] = 'Netscape';
         }

+ 10 - 0
tests/Zend/Http/UserAgent/AbstractDeviceTest.php

@@ -10128,4 +10128,14 @@ audio/vnd.qcelp, application/xhtml+xml'
         $capabilities = Zend_Http_UserAgent_AbstractDevice::extractFromUserAgent($userAgent);
         $this->assertEquals('Opera', $capabilities['browser_name']);
     }
+
+    /**
+     * @group GH-550
+     */
+    public function testOnlyBrowserNameShouldNotResultInNotices()
+    {
+        $userAgent    = 'Mozilla';
+        $capabilities = Zend_Http_UserAgent_AbstractDevice::extractFromUserAgent($userAgent);
+        $this->assertEquals('Mozilla', $capabilities['browser_name']);
+    }
 }