Skip to content

Commit 63acc71

Browse files
Merge branch '5.2' into 5.x
* 5.2: [ErrorHandler] Fix error caused by `include` + open_basedir [FrameworkBundle] Make the TestBrowserToken interchangeable with other tokens [Console] ProgressBar clears too many lines on update [FrameworkBundle] Exclude unreadable files when executing About command [Bridge\Twig] Add 'form-control-range' for range input type Be explicit about transparent background color of links in toolbar [Translation] fix test case name [Cache] Fix wrong namespace in test [DependencyInjection] Fix return type
2 parents 035e390 + bdb7fb4 commit 63acc71

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ErrorRenderer/HtmlErrorRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ private function include(string $name, array $context = []): string
352352
extract($context, \EXTR_SKIP);
353353
ob_start();
354354

355-
include file_exists($name) ? $name : __DIR__.'/../Resources/'.$name;
355+
include is_file(\dirname(__DIR__).'/Resources/'.$name) ? \dirname(__DIR__).'/Resources/'.$name : $name;
356356

357357
return trim(ob_get_clean());
358358
}

0 commit comments

Comments
 (0)