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

Use the same extension when including template file in v2

Browse source
This commit is contained in:
Kijin Sung 2023-10-15 02:55:53 +09:00
parent 4e8c184d0c
commit 02639e9aa0
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/framework/Template.php
View file

@ -19,6 +19,7 @@ class Template
public $absolute_dirname;
public $relative_dirname;
public $filename;
public $extension;
public $exists;
public $absolute_path;
public $relative_path;
@ -105,20 +106,24 @@ class Template
if ($extension !== 'auto')
{
$filename .= '.' . $extension;
$this->extension = $extension;
}
elseif (Storage::exists($this->absolute_dirname . $filename . '.html'))
{
$filename .= '.html';
$this->extension = 'html';
$this->exists = true;
}
elseif (Storage::exists($this->absolute_dirname . $filename . '.blade.php'))
{
$filename .= '.blade.php';
$this->extension = 'blade.php';
$this->exists = true;
}
else
{
$filename .= '.html';
$this->extension = 'html';
}
}
@ -126,11 +131,15 @@ class Template
$this->filename = $filename;
$this->absolute_path = $this->absolute_dirname . $filename;
$this->relative_path = $this->relative_dirname . $filename;
if ($this->extension === null)
{
$this->extension = preg_match('/\.(?:blade\.php|[a-z]+)$/i', $filename, $m) ? $m[1] : '';
}
if ($this->exists === null)
{
$this->exists = Storage::exists($this->absolute_path);
}
if ($this->exists && preg_match('/\.blade\.php$/', $filename))
if ($this->exists && $this->extension === 'blade.php')
{
$this->config->version = 2;
$this->config->autoescape = true;