Changeset 6489

Timestamp:

01/31/2018 04:52:37 AM (7 years ago)

Author:

dd32

Message:

Theme Directory: API: In info/1.2 do not vary the response of feature_list based on the UA, only explicit GET variables.

See #111

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php

@@ -232 +232 @@
         );
 
-        // Get version from user agent since it's not explicitly sent to feature_list requests.
-        if ( preg_match( '|WordPress/([^;]+)|', $_SERVER['HTTP_USER_AGENT'], $matches ) ) {
+        // The 1.2+ api expects a `wp_version` field to be sent and does not use the UA.
+        if ( defined( 'THEMES_API_VERSION' ) && THEMES_API_VERSION >= 1.2 ) {
+            if ( isset( $this->request->wp_version ) ) {
+                $wp_version = $this->request->wp_version;
+            }
+        } elseif ( preg_match( '|WordPress/([^;]+)|', $_SERVER['HTTP_USER_AGENT'], $matches ) ) {
+            // Get version from user agent since it's not explicitly sent to feature_list requests in older API branches.
             $wp_version = $matches[1];
         }