Changeset 6486

Timestamp:

01/31/2018 04:17:58 AM (7 years ago)

Author:

dd32

Message:

API: Plugin & Theme Directory: Use the new constants to determine which API version we're running on.

See #111

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• plugin-directory/standalone/class-plugins-info-api.php (modified) (1 diff)
• theme-directory/class-themes-api.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php

@@ -125 +125 @@
         }
 
-        // Backwards compatibility; the API returns null in case of error..
-        // This is now feature-flagged by the PLUGINS_API_SUPPORTS_ERRORS constant which is defined as `true` in info/1.2 and later.
-        if ( isset( $response['error'] ) && ( defined( 'PLUGINS_API_SUPPORTS_ERRORS' ) && ! PLUGINS_API_SUPPORTS_ERRORS ) ) {
+        // Backwards compatibility; the API returns null in case of error for the 1.0/1.1 API endpoints.
+        if ( isset( $response['error'] ) && defined( 'PLUGINS_API_VERSION' ) && PLUGINS_API_VERSION < 1.2 ) {
             $this->output( null );
             return;

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

@@ -121 +121 @@
         $response = $this->response;
 
-        // Back-compat behaviour:
-        if ( defined( 'THEMES_API_SUPPORTS_ERRORS' ) && ! THEMES_API_SUPPORTS_ERRORS ) {
+        // Back-compat behaviour for the 1.0/1.1 API's
+        if ( defined( 'THEMES_API_VERSION' ) && THEMES_API_VERSION < 1.2 ) {
             if ( isset( $this->response->error ) && 'Theme not found' == $this->response->error ) {
                 $response = false;