Changeset 6017
- Timestamp:
- 10/11/2017 03:54:00 PM (6 years ago)
- Location:
- sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php
r6012 r6017 42 42 // Identify platform/OS in user-agent string. 43 43 if ( preg_match( 44 '/^.+?(?P<platform>Windows Phone( OS)?|Symbian|SymbOS|Android|iPhone|iPad|Windows|Linux|Macintosh| RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',44 '/^.+?(?P<platform>Windows Phone( OS)?|Symbian|SymbOS|Android|iPhone|iPad|Windows|Linux|Macintosh|FreeBSD|OpenBSD|SunOS|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+(\-[0-9a-z\.\-]+)?)*(;|\))/im', 45 45 $user_agent, 46 46 $regs … … 51 51 // Find tokens of interest in user-agent string. 52 52 preg_match_all( 53 '%(?P<name>Opera Mini|Opera|OPR|Edge|UCBrowser|UCWEB|QQBrowser|SymbianOS|Symbian|S40OviBrowser|Trident|Silk| PaleMoon|Camino|Kindle|Firefox|SamsungBrowser|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',53 '%(?P<name>Opera Mini|Opera|OPR|Edge|UCBrowser|UCWEB|QQBrowser|SymbianOS|Symbian|S40OviBrowser|Trident|Silk|Konqueror|PaleMoon|Camino|Kindle|Firefox|SamsungBrowser|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im', 54 54 $user_agent, 55 55 $result, … … 165 165 elseif ( false !== ( $key = array_search( 'SamsungBrowser', $result['name'] ) ) ) { 166 166 $data['name'] = 'Samsung Browser'; 167 $data['version'] = $result['version'][ $key ]; 168 } 169 // Konqueror 170 elseif ( 171 false !== ( $key = array_search( 'Konqueror', $result['name'] ) ) 172 || 173 false !== ( $key = array_search( 'konqueror', $result['name'] ) ) 174 ) { 175 $data['name'] = 'Konqueror'; 167 176 $data['version'] = $result['version'][ $key ]; 168 177 } -
sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php
r6012 r6017 342 342 ], 343 343 344 // Konqueror 345 346 [ 347 'Mozilla/5.0 (X11; FreeBSD) AppleWebKit/537.21 (KHTML, like Gecko) konqueror/4.14.3 Safari/537.21', 348 'FreeBSD Konqueror 4.14.3', 349 ], 350 [ 351 'Mozilla/5.0 (compatible; Konqueror/3; Linux)', 352 'Linux Konqueror 3', 353 ], 354 [ 355 'Mozilla/5.0 (compatible; Konqueror/4.4; Linux 2.6.32-22-generic; X11; en_US) KHTML/4.4.3 (like Gecko) Kubuntu', 356 'Linux Konqueror 4.4', 357 ], 358 [ 359 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) konqueror/4.14.2 Safari/537.21', 360 'Linux Konqueror 4.14.2', 361 ], 362 [ 363 'Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)', 364 'OpenBSD Konqueror 4.1', 365 ], 366 [ 367 'Mozilla/5.0 (compatible; Konqueror/3.5; SunOS) KHTML/3.5.1 (like Gecko)', 368 'SunOS Konqueror 3.5', 369 ], 370 [ 371 'Mozilla/5.0 (Windows; Windows i686) KHTML/4.10.2 (like Gecko) Konqueror/4.10', 372 'Windows Konqueror 4.10', 373 ], 374 344 375 // Microsoft Edge 345 376
Note: See TracChangeset
for help on using the changeset viewer.