Ticket #54272: 54272.4.diff

src/wp-includes/class-wp-theme.php

@@ -338 +338 @@
 
                 if ( ! $this->template ) {
                         $this->template = $this->stylesheet;
-                        if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
+                        $theme_path     = $this->theme_root . '/' . $this->stylesheet;
+
+                        if ( ! file_exists( $theme_path . '/templates/index.html' )
+                                && ! file_exists( $theme_path . '/index.php' )
+                        ) {
                                 $error_message = sprintf(
-                                        /* translators: 1: index.php, 2: Documentation URL, 3: style.css */
-                                        __( 'Template is missing. Standalone themes need to have a %1$s template file. <a href="%2$s">Child themes</a> need to have a Template header in the %3$s stylesheet.' ),
+                                        /* translators: 1: templates/index.html, 2: index.php, 3: Documentation URL, 4: 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 Template header in the %4$s stylesheet.' ),
+                                        '<code>templates/index.html</code>',
                                         '<code>index.php</code>',
                                         __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ),
                                         '<code>style.css</code>'

src/wp-includes/theme.php

@@ -830 +830 @@
 }
 
 /**
- * Checks that the active theme has 'index.php' and 'style.css' files.
+ * Checks that the active theme has the required files.
  *
+ * Standalone themes need to have a `templates/index.html` or `index.php` template file.
+ * Child themes need to have a `Template` header in the `style.css` stylesheet.
+ *
  * Does not initially check the default theme, which is the fallback and should always exist.
  * But if it doesn't exist, it'll fall back to the latest core default theme that does exist.
  * Will switch theme to the fallback theme if active theme does not validate.
@@ -840 +843 @@
  * this functionality.
  *
  * @since 1.5.0
+ * @since 6.0.0 Removed the requirement for block themes to have an `index.php` template.
  *
  * @see WP_DEFAULT_THEME
  *
@@ -857 +861 @@
                 return true;
         }
 
-        if ( ! file_exists( get_template_directory() . '/index.php' ) ) {
+        if ( ! file_exists( get_template_directory() . '/templates/index.html' )
+                && ! file_exists( get_template_directory() . '/index.php' )
+        ) {
                 // Invalid.
         } elseif ( ! file_exists( get_template_directory() . '/style.css' ) ) {
                 // Invalid.