Changeset 2995

Timestamp:

07/08/2008 02:36:45 AM (3 months ago)

Author:

Geert

Message:

Fixing #541. Allowing for letters in versions. Also added a few browsers.

Location:

trunk/system

Files:

• config/user_agents.php (modified) (5 diffs)
• core/Kohana.php (modified) (1 diff)

trunk/system/config/user_agents.php

@@ -47 +47 @@
         'hp-ux'          => 'HP-UX',
         'hurd'           => 'GNU/Hurd',
-        'unix'           => 'Unknown Unix OS'
+        'unix'           => 'Unknown Unix OS',
 );
 
@@ -67 +67 @@
         'Safari'            => 'Safari',
         'Konqueror'         => 'Konqueror',
+        'Epiphany'          => 'Epiphany',
+        'Galeon'            => 'Galeon',
         'Mozilla'           => 'Mozilla',
         'icab'              => 'iCab',
@@ -73 +75 @@
         'hotjava'           => 'HotJava',
         'amaya'             => 'Amaya',
-        'IBrowse'           => 'IBrowse'
+        'IBrowse'           => 'IBrowse',
 );
 
@@ -91 +93 @@
         'ericsson'       => 'Ericsson',
         'blackBerry'     => 'BlackBerry',
-        'motorola'       => 'Motorola'
+        'motorola'       => 'Motorola',
 );
 
@@ -104 +106 @@
         'fastcrawler' => 'FastCrawler',
         'infoseek'    => 'InfoSeek Robot 1.0',
-        'lycos'       => 'Lycos'
+        'lycos'       => 'Lycos',
 );

trunk/system/core/Kohana.php

@@ -1207 +1207 @@
                                         if (stripos(Kohana::$user_agent, $agent) !== FALSE)
                                         {
-                                                if ($type === 'browser' AND preg_match('|'.preg_quote($agent).'[^0-9.]*+([0-9.]+)|i', Kohana::$user_agent, $match))
+                                                if ($type === 'browser' AND preg_match('|'.preg_quote($agent).'[^0-9.]*+([0-9.][0-9.a-z]*)|i', Kohana::$user_agent, $match))
                                                 {
                                                         // Set the browser version