Changeset 53417 for branches/6.0/src/wp-admin/includes/class-theme-upgrader.php

Timestamp:

05/20/2022 12:59:55 AM (3 years ago)

Author:

peterwilsoncc

Message:

Themes: Accept valid block themes.

Updates theme validation to accept block themes. This replaces the requirement for an index.php with a requirement for either an index.php, /templates/index.html or the deprecated /block-templates/index.html.

Validation is updated for theme uploads, within WP_Theme::__construct and validate_current_theme().

A block theme using the deprecated file structure is now included in the unit tests.

Props peterwilsoncc, sergeybiryukov, hellofromtonya, costdev, azaozz, gziolo, FlorianBrinkmann, Boniu91, aristath, poena, audrasjb.
Merges [53416] to the 6.0 branch.
Fixes #55682.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-theme-upgrader.php (modified) (1 diff)

branches/6.0/src/wp-admin/includes/class-theme-upgrader.php

@@ -567 +567 @@
         }
 
-        // If it's not a child theme, it must have at least an index.php to be legit.
-        if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
+        /*
+         * Parent themes must contain an index file:
+         * - classic themes require /index.php
+         * - block themes require /templates/index.html or block-templates/index.html (deprecated 5.9.0).
+         */
+        if (
+            empty( $info['Template'] ) &&
+            ! file_exists( $working_directory . 'index.php' ) &&
+            ! file_exists( $working_directory . 'templates/index.html' ) &&
+            ! file_exists( $working_directory . 'block-templates/index.html' )
+        ) {
             return new WP_Error(
                 'incompatible_archive_theme_no_index',
                 $this->strings['incompatible_archive'],
                 sprintf(
-                    /* translators: %s: index.php */
-                    __( 'The theme is missing the %s file.' ),
-                    '<code>index.php</code>'
+                    /* translators: 1: templates/index.html, 2: index.php, 3: Documentation URL, 4: Template, 5: style.css */
+                    __( 'Template is missing. Standalone themes need to have a %1$s or %2$s template file. <a href="%3$s">Child themes</a> need to have a %4$s header in the %5$s stylesheet.' ),
+                    '<code>templates/index.html</code>',
+                    '<code>index.php</code>',
+                    __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ),
+                    '<code>Template</code>',
+                    '<code>style.css</code>'
                 )
             );