Changeset 5963
- Timestamp:
- 09/25/2017 07:09:46 PM (8 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
r5962 r5963 40 40 41 41 if ( preg_match( 42 '/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: NT)*(?: [ix]?[0-9._]+)*(;|\))/im',42 '/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im', 43 43 $user_agent, 44 44 $regs … … 57 57 58 58 preg_match_all( 59 '%(?P<name> Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Opera|Version)(?:[/ ])(?P<version>[0-9.]+)%im',59 '%(?P<name>Opera Mini|Opera|OPR|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im', 60 60 $user_agent, 61 61 $result, … … 70 70 } 71 71 72 if ( 'AppleWebKit' == $result['name'][0] ) { 72 // Opera 73 if ( 74 false !== ( $key = array_search( 'Opera Mini', $result['name'] ) ) 75 || 76 false !== ( $key = array_search( 'Opera', $result['name'] ) ) 77 || 78 false !== ( $key = array_search( 'OPR', $result['name'] ) ) 79 ) { 80 $data['name'] = $result['name'][ $key ]; 81 if ( 'OPR' === $data['name'] ) { 82 $data['name'] = 'Opera'; 83 } elseif ( 'Opera Mini' === $data['name'] ) { 84 $data['mobile'] = true; 85 } 86 $data['version'] = $result['version'][ $key ]; 87 } elseif ( 'AppleWebKit' == $result['name'][0] ) { 73 88 if ( $key = array_search( 'Mobile Safari', $result['name'] ) ) { 74 89 $data['name'] = 'Mobile Safari'; … … 88 103 $data['name'] = 'webkit'; 89 104 } 90 $data['version'] = $result['version'][ $key ];91 } elseif ( $key = array_search( 'Opera', $result['name'] ) ) {92 $data['name'] = $result['name'][ $key ];93 105 $data['version'] = $result['version'][ $key ]; 94 106 } elseif ( 'MSIE' == $result['name'][0] ) { -
sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php
r5962 r5963 91 91 'Windows Chrome 7.0.517.41', 92 92 ], 93 94 // Opera 95 93 96 [ 94 97 'Opera/9.80 (Windows NT 6.0; U; en) Presto/2.8.99 Version/11.10', … … 115 118 'Windows Opera 11.01', 116 119 ], 120 [ 121 'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36 OPR/36.0.2130.80', 122 'Windows Opera 36.0.2130.80', 123 ], 124 [ 125 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36 OPR/43.0.2442.991', 126 'Windows Opera 43.0.2442.991', 127 ], 128 [ 129 'Opera/9.80 (X11; Linux zvav; U; en) Presto/2.8.119 Version/11.10', 130 'Linux Opera 11.10', 131 ], 132 [ 133 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.87 Safari/537.36 OPR/37.0.2178.31 (Edition beta)', 134 'Linux Opera 37.0.2178.31', 135 ], 136 [ 137 'Opera/9.80 (Macintosh; Intel Mac OS X 10.10.5) Presto/2.12.388 Version/12.16', 138 'Macintosh Opera 12.16', 139 ], 117 140 // #3161 118 141 [ … … 120 143 'Windows Opera 12.18', 121 144 ], 145 146 // Opera Mini 147 148 [ 149 'Opera/9.80 (Android; Opera Mini/24.0.2254/62.178; U; en) Presto/2.12.423 Version/12.16', 150 'Android Opera Mini 12.16', 151 ], 152 [ 153 'Opera/9.80 (J2ME/MIDP; Opera Mini/4.2/28.3590; U; en) Presto/2.8.119 Version/11.10', 154 'Mobile Opera Mini 11.10', 155 ], 156 [ 157 'Opera/9.80 (SpreadTrum; Opera Mini/4.4.31492/66.299; U; en) Presto/2.12.423 Version/12.16', 158 'Mobile Opera Mini 12.16', 159 ], 160 122 161 [ 123 162 'Mozilla/5.0 (Windows; U; Windows NT 6.1; tr-TR) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27',
Note: See TracChangeset
for help on using the changeset viewer.