Changeset 51601

Timestamp:

08/11/2021 01:00:46 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Themes: Make sure the theme API response is not an error before operating on it in themes_api().

This fixes a potential bug and avoids PHP warnings when themes_api( 'query_themes' ) is called and a successful API response is not received.

Follow-up to [42632].

Props pierlo.
Fixes #53913.

File:

• trunk/src/wp-admin/includes/theme.php (modified) (1 diff)

trunk/src/wp-admin/includes/theme.php

@@ -603 +603 @@
         }
 
-        // Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
-        if ( 'query_themes' === $action ) {
-            foreach ( $res->themes as $i => $theme ) {
-                $res->themes[ $i ] = (object) $theme;
+        if ( ! is_wp_error( $res ) ) {
+            // Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
+            if ( 'query_themes' === $action ) {
+                foreach ( $res->themes as $i => $theme ) {
+                    $res->themes[ $i ] = (object) $theme;
+                }
             }
-        }
-        // Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
-        if ( 'feature_list' === $action ) {
-            $res = (array) $res;
+
+            // Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
+            if ( 'feature_list' === $action ) {
+                $res = (array) $res;
+            }
         }
     }