fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 11:11:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix failure to load template file if a directory of the same name (minus the extension) exists in the same path

Browse source
This commit is contained in:
Kijin Sung 2023-10-27 16:11:25 +09:00
parent 47db7e6a0b
commit 18c0e14b4b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/framework/Template.php
View file

@ -139,20 +139,20 @@ class Template
$filename = preg_replace('/[\{\}\(\)\[\]<>\$\'"]/', '', $filename); $filename = preg_replace('/[\{\}\(\)\[\]<>\$\'"]/', '', $filename);
// If the filename doesn't have a typical extension and doesn't exist, try adding common extensions. // If the filename doesn't have a typical extension and doesn't exist, try adding common extensions.
if (!preg_match('/\.(?:html?|php)$/', $filename) && !Storage::exists($this->absolute_dirname . $filename)) if (!preg_match('/\.(?:html?|php)$/', $filename) && !Storage::isFile($this->absolute_dirname . $filename))
{ {
if ($extension !== 'auto') if ($extension !== 'auto')
{ {
$filename .= '.' . $extension; $filename .= '.' . $extension;
$this->extension = $extension; $this->extension = $extension;
} }
elseif (Storage::exists($this->absolute_dirname . $filename . '.html')) elseif (Storage::isFile($this->absolute_dirname . $filename . '.html'))
{ {
$filename .= '.html'; $filename .= '.html';
$this->extension = 'html'; $this->extension = 'html';
$this->exists = true; $this->exists = true;
} }
elseif (Storage::exists($this->absolute_dirname . $filename . '.blade.php')) elseif (Storage::isFile($this->absolute_dirname . $filename . '.blade.php'))
{ {
$filename .= '.blade.php'; $filename .= '.blade.php';
$this->extension = 'blade.php'; $this->extension = 'blade.php';
@ -175,7 +175,7 @@ class Template
} }
if ($this->exists === null) if ($this->exists === null)
{ {
$this->exists = Storage::exists($this->absolute_path); $this->exists = Storage::isFile($this->absolute_path);
} }
if ($this->exists && $this->extension === 'blade.php') if ($this->exists && $this->extension === 'blade.php')
{ {