mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
[ticket/11727] Fix indentation
PHPBB3-11727
This commit is contained in:
parent
5e86f5687b
commit
088dfc1200
1 changed files with 9 additions and 9 deletions
|
@ -91,18 +91,18 @@ class phpbb_template_twig_loader extends Twig_Loader_Filesystem
|
||||||
* Override for Twig_Loader_Filesystem::findTemplate to add support
|
* Override for Twig_Loader_Filesystem::findTemplate to add support
|
||||||
* for loading from safe directories.
|
* for loading from safe directories.
|
||||||
*/
|
*/
|
||||||
protected function findTemplate($name)
|
protected function findTemplate($name)
|
||||||
{
|
{
|
||||||
$name = (string) $name;
|
$name = (string) $name;
|
||||||
|
|
||||||
// normalize name
|
// normalize name
|
||||||
$name = preg_replace('#/{2,}#', '/', strtr($name, '\\', '/'));
|
$name = preg_replace('#/{2,}#', '/', strtr($name, '\\', '/'));
|
||||||
|
|
||||||
// If this is in the cache we can skip the entire process below
|
// If this is in the cache we can skip the entire process below
|
||||||
// as it should have already been validated
|
// as it should have already been validated
|
||||||
if (isset($this->cache[$name])) {
|
if (isset($this->cache[$name])) {
|
||||||
return $this->cache[$name];
|
return $this->cache[$name];
|
||||||
}
|
}
|
||||||
|
|
||||||
// First, find the template name. The override above of validateName
|
// First, find the template name. The override above of validateName
|
||||||
// causes the validateName process to be skipped for this call
|
// causes the validateName process to be skipped for this call
|
||||||
|
@ -110,7 +110,7 @@ class phpbb_template_twig_loader extends Twig_Loader_Filesystem
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Try validating the name (which may throw an exception)
|
// Try validating the name (which may throw an exception)
|
||||||
parent::validateName($name);
|
parent::validateName($name);
|
||||||
}
|
}
|
||||||
catch (Twig_Error_Loader $e)
|
catch (Twig_Error_Loader $e)
|
||||||
|
|
Loading…
Add table
Reference in a new issue