diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 01:12:03 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 01:12:03 +0200 |
| commit | f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b (patch) | |
| tree | 20e82f52d2e6ffb5b5f3717849e823e56a1f5468 /phpBB/phpbb/template/twig/loader.php | |
| parent | ad11925c7730e4f3c6b1cffe46c6ba531f04f4d9 (diff) | |
| parent | f4ef1ab6bd4b18ea002ec1d5bf733d4f6b357e57 (diff) | |
| download | forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar.gz forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar.bz2 forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar.xz forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.zip | |
Merge pull request #2600 from Nicofuma/ticket/12715
[ticket/12715] Fix mistakes in the doc blocks
* Nicofuma/ticket/12715: (30 commits)
[ticket/12715] Add missing new line in the notification manager
[ticket/12715] Cleanup comments in \phpbb\symfony_request
[ticket/12715] Cleanup comments in \phpbb\permissions
[ticket/12715] Cleanup comments in \phpbb\path_helper
[ticket/12715] Cleanup comments in \phpbb\pagination
[ticket/12715] Cleanup comments in \phpbb\datetime
[ticket/12715] Cleanup comments in \phpbb\content_visibility
[ticket/12715] Cleanup comments in \phpbb\tree\*
[ticket/12715] Cleanup comments in \phpbb\template\*
[ticket/12715] Cleanup comments in \phpbb\plupload\*
[ticket/12715] Cleanup comments in \phpbb\profilefields\*
[ticket/12715] Cleanup comments in \phpbb\passwords\*
[ticket/12715] Cleanup comments in \phpbb\notification\*
[ticket/12715] Cleanup comments in \phpbb\mimetype\*
[ticket/12715] Cleanup comments in \phpbb\message\*
[ticket/12715] Cleanup comments in \phpbb\log\*
[ticket/12715] Cleanup comments in \phpbb\lock\*
[ticket/12715] Cleanup comments in \phpbb\groupposition\*
[ticket/12715] Cleanup comments in \phpbb\feed\*
[ticket/12715] Cleanup comments in \phpbb\extension\*
...
Diffstat (limited to 'phpBB/phpbb/template/twig/loader.php')
| -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 851eb9ddd0..2f8ffaa776 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -24,7 +24,7 @@ class loader extends \Twig_Loader_Filesystem * Set safe directories * * @param array $directories Array of directories that are safe (empty to clear) - * @return Twig_Loader_Filesystem + * @return \Twig_Loader_Filesystem */ public function setSafeDirectories($directories = array()) { @@ -45,7 +45,7 @@ class loader extends \Twig_Loader_Filesystem * Add safe directory * * @param string $directory Directory that should be added - * @return Twig_Loader_Filesystem + * @return \Twig_Loader_Filesystem */ public function addSafeDirectory($directory) { @@ -110,7 +110,7 @@ class loader extends \Twig_Loader_Filesystem // Try validating the name (which may throw an exception) parent::validateName($name); } - catch (Twig_Error_Loader $e) + catch (\Twig_Error_Loader $e) { if (strpos($e->getRawMessage(), 'Looks like you try to load a template outside configured directories') === 0) { |