makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15508] Update loader

Browse source 
PHPBB3-15508
This commit is contained in:
François-Xavier de Guillebon 2018-01-16 13:00:50 +01:00
parent 23b13c239b
commit fbbf5a7cec
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/template/twig/loader.php
View file

@ -110,7 +110,7 @@ class 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, $throw = true)
{ {
$name = (string) $name; $name = (string) $name;
@ -126,12 +126,12 @@ class loader extends \Twig_Loader_Filesystem
// 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
$file = parent::findTemplate($name); $file = parent::findTemplate($name, $throw);
try try
{ {
// Try validating the name (which may throw an exception) // Try validating the name (which may throw an exception)
parent::validateName($name); $this->validateName($name);
} }
catch (\Twig_Error_Loader $e) catch (\Twig_Error_Loader $e)
{ {