tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Catch Path::join() exceptions in findTemplate() (fixes #9084)

Browse Source
This commit is contained in:
Loz Calver 2019-06-21 09:40:18 +01:00
parent a54ba97e16
commit b1551a687d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/View/ThemeResourceLoader.php
View File

@ -218,9 +218,13 @@ class ThemeResourceLoader
foreach ($themePaths as $themePath) {
// Join path
$pathParts = [ $this->base, $themePath, 'templates', $head, $type, $tail ];
$path = Path::join($pathParts) . '.ss';
if (file_exists($path)) {
return $path;
try {
$path = Path::join($pathParts) . '.ss';
if (file_exists($path)) {
return $path;
}
} catch (InvalidArgumentException $e) {
// No-op
}
}
}