Changeset 61925

Timestamp:

03/11/2026 01:20:35 AM (2 weeks ago)

Author:

peterwilsoncc

Message:

Grouped backports for the 6.5 branch.

• Customize: Introduce a fix for themes that pass a stringable object through the template_include filter despite it being documented as only accepting a string.
• Update version string following r61904.

Props dmsnell, desrosj, westonruter.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-block-patterns-registry.php (modified) (1 diff)
• src/wp-includes/interactivity-api/class-wp-interactivity-api.php (modified) (1 diff)
• src/wp-includes/template-loader.php (modified) (1 diff)

branches/6.5/src/wp-includes/class-wp-block-patterns-registry.php

@@ -200 +200 @@
         }
 
-        $pattern_path = realpath( $patterns[ $pattern_name ]['filePath'] ?? '' );
+        $file_path    = $patterns[ $pattern_name ]['filePath'] ?? '';
+        $is_stringy   = is_string( $file_path ) || ( is_object( $file_path ) && method_exists( $file_path, '__toString' ) );
+        $pattern_path = $is_stringy ? realpath( (string) $file_path ) : null;
         if (
             ! isset( $patterns[ $pattern_name ]['content'] ) &&

branches/6.5/src/wp-includes/interactivity-api/class-wp-interactivity-api.php

@@ -614 +614 @@
                             esc_attr( 'data-wp-on--' . substr( $bound_attribute, 2 ) )
                         ),
-                        'x.y.z'
+                        '6.9.2'
                     );
                     continue;

branches/6.5/src/wp-includes/template-loader.php

@@ -102 +102 @@
      * @param string $template The path of the template to include.
      */
-    $template = apply_filters( 'template_include', $template );
-    $template = is_string( $template ) ? realpath( $template ) : null;
+    $template   = apply_filters( 'template_include', $template );
+    $is_stringy = is_string( $template ) || ( is_object( $template ) && method_exists( $template, '__toString' ) );
+    $template   = $is_stringy ? realpath( (string) $template ) : null;
     if (
         is_string( $template ) &&