Changeset 62841

Timestamp:

09/17/2026 05:38:46 PM (5 weeks ago)

Author:

desrosj

Message:

Editor: Constrain block template file resolution to the template directory.

Merges r63663 to the 7.1 branch.

Props xknown, ramonopoly, jonsurrell.

Built from ​https://develop.svn.wordpress.org/branches/7.1@63667

Location:

branches/7.1/wp-includes

Files:

• block-template-utils.php (modified) (1 diff)
• version.php (modified) (1 diff)

branches/7.1/wp-includes/block-template-utils.php

@@ -344 +344 @@
         foreach ( $themes as $theme_slug => $theme_dir ) {
                 $template_base_paths = get_block_theme_folders( $theme_slug );
-                $file_path           = $theme_dir . '/' . $template_base_paths[ $template_type ] . '/' . $slug . '.html';
-                if ( file_exists( $file_path ) ) {
+                $template_dir        = $theme_dir . '/' . $template_base_paths[ $template_type ];
+                $file_path           = $template_dir . '/' . $slug . '.html';
+                $template_file       = realpath( $file_path );
+                $template_root       = realpath( $template_dir );
+
+                if (
+                        false !== $template_file &&
+                        false !== $template_root &&
+                        str_starts_with(
+                                wp_normalize_path( $template_file ),
+                                trailingslashit( wp_normalize_path( $template_root ) )
+                        )
+                ) {
                         $new_template_item = array(
                                 'slug'  => $slug,
-                                'path'  => $file_path,
+                                'path'  => $template_file,
                                 'theme' => $theme_slug,
                                 'type'  => $template_type,

branches/7.1/wp-includes/version.php

@@ -17 +17 @@
  * @global string $wp_version
  */
-$wp_version = '7.1.1-RC1-63666';
+$wp_version = '7.1.1-RC1-63667';
 
 /**