tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-21 04:01:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.2' into 4.3

Browse Source 
# Conflicts:
 #	src/View/ThemeResourceLoader.php
This commit is contained in:
Robbie Averill 2019-09-13 18:10:37 -07:00
commit 066ce8e01c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/View/ThemeResourceLoader.php
View File

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