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

Timestamp:

09/21/2017 08:17:25 PM (7 years ago)

Author:

coffee2code

Message:

Browse Happy API: More plainly short-circuit browser data fetching for mobile platforms.

• Initializes all array elements in browsehappy_parse_user_agent()
• Removes short-circuit that assigned platform name to browser name for mobile platforms
• Fixes 4 of 5 failing tests

It appears that during user-agent parsing for mobile platforms, the browser name is intentionally overridden to be the platform name so as to be the name passed when requesting browser info. Since no browsers are defined using the platform name (e.g. "iPad"), no info is obtained, effectively bypassing checks for iPad/iPhone/Android mobile browsers at this time. This change make this much clearer.

File:

• sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php (modified) (2 diffs)

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

@@ -25 +25 @@
  */
 function browsehappy_parse_user_agent( $user_agent ) {
-    $data = array();
+    $data = array(
+        'name'            => '',
+        'version'         => '',
+        'platform'        => '',
+        'update_url'      => '',
+        'img_src'         => '',
+        'img_src_ssl'     => '',
+        'current_version' => '',
+        'upgrade'         => false,
+        'insecure'        => false,
+    );
 
     if ( preg_match(
@@ -95 +105 @@
     }
 
-    if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone' ) ) ) {
-        $data['name'] = $data['platform'];
-    }
-
     // If Version/x.x.x was specified in UA string
     if ( ! empty( $version ) ) {
         $data['version'] = $version;
+    }
+
+    // Don't fetch additional browser data for non-mobile platform browsers.
+    if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone' ) ) ) {
+        return $data;
     }