Changeset 14524 for sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/rest-api/class-theme-preview.php

Timestamp:

09/04/2025 06:01:37 AM (2 months ago)

Author:

dd32

Message:

Theme Directory: Resolve some Undefined warnings / unset offsets in the Theme Preview/Review endpoint.

File:

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

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

@@ -151 +151 @@
         $version         = $params['version'] ?? false;
         $theme_package   = new WPORG_Themes_Repo_Package( $theme_data->slug, $version );
-        $parent_package  = $theme_data->template ? new WPORG_Themes_Repo_Package( $theme_data->template ) : false;
         $theme_blueprint = $theme_package->preview_blueprint;
+        $parent_package  = false;
+        if ( isset( $theme_data->template ) && $theme_data->template !== $theme_data->slug ) {
+            $parent_package = new WPORG_Themes_Repo_Package( $theme_data->template );
+        }
 
         // Base blueprint.
@@ -214 +217 @@
                 'options' => [
                     'blogname'        => $theme_data->name . ( $version ? " $version" : '' ),
-                    'blogdescription' => preg_replace( '![.].+$!',  '.', $theme_data->sections['description'] ), // First sentence only.
+                    'blogdescription' => preg_replace( '![.].+$!',  '.', $theme_data->sections['description'] ?? '' ), // First sentence only.
                 ]
             ],
@@ -230 +233 @@
             // Note: The following use `url` to allow setting the caption to the proper theme name.
             // Install parent theme.
-            empty( $theme_data->template ) ? false : [
+            ! $parent_package ? false : [
                 'step'         => 'installTheme',
                 'themeData' => [
@@ -259 +262 @@
         $theme_steps = array_filter(
             $theme_steps,
-            static function( $step ) use( $invalid_steps ) {
+            static function( $step ) {
                 // Don't install assets from URLs.
                 if (