diff options
| author | François-Xavier de Guillebon <fdn2@3ds.com> | 2018-01-16 13:00:50 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 21:30:39 +0200 |
| commit | c0fde5d5fd0a776b1bfca38759c2a6eaa325c258 (patch) | |
| tree | 57d24b6958e7ba50733e3c95363b1795cfcfc25e /phpBB/phpbb/template | |
| parent | 40e61e4d1ec3da2ea48efda401b0044f2aff6071 (diff) | |
| download | forums-c0fde5d5fd0a776b1bfca38759c2a6eaa325c258.tar forums-c0fde5d5fd0a776b1bfca38759c2a6eaa325c258.tar.gz forums-c0fde5d5fd0a776b1bfca38759c2a6eaa325c258.tar.bz2 forums-c0fde5d5fd0a776b1bfca38759c2a6eaa325c258.tar.xz forums-c0fde5d5fd0a776b1bfca38759c2a6eaa325c258.zip | |
[ticket/15508] Update loader
PHPBB3-15508
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/twig/loader.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php index d914c7807a..0f193dbe59 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -116,7 +116,7 @@ class loader extends \Twig_Loader_Filesystem * Override for Twig_Loader_Filesystem::findTemplate to add support * for loading from safe directories. */ - protected function findTemplate($name) + protected function findTemplate($name, $throw = true) { $name = (string) $name; @@ -132,12 +132,12 @@ class loader extends \Twig_Loader_Filesystem // First, find the template name. The override above of validateName // causes the validateName process to be skipped for this call - $file = parent::findTemplate($name); + $file = parent::findTemplate($name, $throw); try { // Try validating the name (which may throw an exception) - parent::validateName($name); + $this->validateName($name); } catch (\Twig_Error_Loader $e) { |