mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-29 04:39:01 +02:00
Merge branch '4.2' into 4.3
# Conflicts: # src/View/ThemeResourceLoader.php
This commit is contained in:
commit
066ce8e01c
@ -236,10 +236,14 @@ class ThemeResourceLoader implements Flushable
|
|||||||
foreach ($themePaths as $themePath) {
|
foreach ($themePaths as $themePath) {
|
||||||
// Join path
|
// Join path
|
||||||
$pathParts = [ $this->base, $themePath, 'templates', $head, $type, $tail ];
|
$pathParts = [ $this->base, $themePath, 'templates', $head, $type, $tail ];
|
||||||
$path = Path::join($pathParts) . '.ss';
|
try {
|
||||||
if (file_exists($path)) {
|
$path = Path::join($pathParts) . '.ss';
|
||||||
$this->getCache()->set($cacheKey, $path);
|
if (file_exists($path)) {
|
||||||
return $path;
|
$this->getCache()->set($cacheKey, $path);
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
} catch (InvalidArgumentException $e) {
|
||||||
|
// No-op
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user