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

Timestamp:

01/30/2018 05:54:05 AM (8 years ago)

Author:

dd32

Message:

Theme Directory: API: Add an info./1.2 endpoint which returns real errors in the event a theme cannot be found.

Back-compat behaviour for info/1.0 and info/1.1 is to return false in the event a theme cannot be located.

See #111

File:

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

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

@@ -119 +119 @@
      */
     public function get_result( $format = 'raw' ) {
+        $response = $this->response;
+
+        // Back-compat behaviour:
+        if ( defined( 'THEMES_API_SUPPORTS_ERRORS' ) && ! THEMES_API_SUPPORTS_ERRORS ) {
+            if ( isset( $this->response->error ) && 'Theme not found' == $this->response->error ) {
+                $response = false;
+            }
+        }
+
         if ( 'json' === $format ) {
-            return wp_json_encode( $this->response );
+            return wp_json_encode( $response );
         } elseif ( 'php' === $format ) {
-            return serialize( $this->response );
+            return serialize( $response );
         } else { // 'raw' === $format, or anything else.
-            return $this->response;
+            return $response;
         }
     }
@@ -327 +336 @@
             ) );
 
-            if ( ! empty( $themes ) ) {
+            if ( $themes ) {
                 $this->response = $this->fill_theme( $themes[0] );
+            } else {
+                $this->response = (object) array( 'error' => 'Theme not found' ); // Check get_result() if changing this string.
             }
         }