Changeset 5979

Timestamp:

09/29/2017 06:47:11 PM (9 years ago)

Author:

coffee2code

Message:

Browse Happy API: Add support for Nokia Browser.

Location:

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0

Files:

• parse.php (modified) (2 diffs)
• tests/phpunit/tests/browse-happy.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php

@@ -59 +59 @@
 
         preg_match_all(
-                '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+                '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
                 $user_agent,
                 $result,
@@ -87 +87 @@
                 }
                 $data['version'] = $result['version'][ $key ];
+        }
+        // Nokia Browser
+        elseif ( $key = array_search( 'NokiaBrowser', $result['name'] ) ) {
+                $data['name']     = 'Nokia Browser';
+                $data['version']  = $result['version'][ $key ];
+                $data['mobile']   = true;
         } elseif ( 'AppleWebKit' == $result['name'][0] ) {
                 if ( $key = array_search( 'Edge', $result['name'] ) ) {

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php

@@ -287 +287 @@
                         ],
 
+                        // Nokia Browser
+
+                        [
+                                'Mozilla/5.0 (Linux; Android 4.1.2; Nokia_X Build/JZO54K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.82 Mobile Safari/537.36 NokiaBrowser/1.2.0.12',
+                                'Android Nokia Browser 1.2.0.12',
+                        ],
+                        [
+                                'Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13',
+                                'Mobile Nokia Browser 8.5.0',
+                        ],
+
                         // Opera