mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-06-30 00:19:25 +02:00
Merge pull request #9085 from kinglozzer/9084-path-join-exception
Catch Path::join() exceptions in findTemplate() (fixes #9084)
This commit is contained in:
commit
41a766d135
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user