Changeset 57947 for branches/6.5

Timestamp:

04/09/2024 01:23:21 AM (8 months ago)

Author:

joemcgill

Message:

Themes: Avoid errors in some environments from _get_block_templates_paths.

This adds an is_dir() check in _get_block_templates_paths before trying to run a RecursiveDirectoryIterator to avoid errors being reported in New Relic even thought the errors should be handled by a try/catch block.

Follow-up to [57215].

Reviewed by jorbin.
Merges [57928] to the to the 6.5 branch.

Props iCaleb, sean212, mukesh27, joemcgill.
Fixes #60915.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/wp-includes/block-template-utils.php (modified) (2 diffs)

branches/6.5/src/wp-includes/block-template-utils.php

@@ -230 +230 @@
     }
     $path_list = array();
-    try {
+    if ( is_dir( $base_directory ) ) {
         $nested_files      = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $base_directory ) );
         $nested_html_files = new RegexIterator( $nested_files, '/^.+\.html$/i', RecursiveRegexIterator::GET_MATCH );
@@ -236 +236 @@
             $path_list[] = $path;
         }
-    } catch ( Exception $e ) {
-        // Do nothing.
     }
     $template_path_list[ $base_directory ] = $path_list;