diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:48:24 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:48:24 +0100 |
| commit | 5307f47654fef0dc3581d1497686a7d72aa8294a (patch) | |
| tree | 747636e0cd016df0439182b380723780ec466bf3 /phpBB/phpbb/template | |
| parent | fd25d00fac21f766fc7a448aee2c9b0b0991b926 (diff) | |
| parent | 08e186af8ed867c5d755d0fe979e5e9e46e3c09e (diff) | |
| download | forums-5307f47654fef0dc3581d1497686a7d72aa8294a.tar forums-5307f47654fef0dc3581d1497686a7d72aa8294a.tar.gz forums-5307f47654fef0dc3581d1497686a7d72aa8294a.tar.bz2 forums-5307f47654fef0dc3581d1497686a7d72aa8294a.tar.xz forums-5307f47654fef0dc3581d1497686a7d72aa8294a.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13133] Fix variable name in set_custom_style()
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/twig/twig.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index 4962d14aef..605d37e954 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -261,19 +261,19 @@ class twig extends \phpbb\template\base $ext_style_theme_path = $ext_style_path . 'theme/'; } - $ok = false; + $is_valid_dir = false; if (is_dir($ext_style_template_path)) { - $ok = true; + $is_valid_dir = true; $paths[] = $ext_style_template_path; } if (is_dir($ext_style_theme_path)) { - $ok = true; + $is_valid_dir = true; $paths[] = $ext_style_theme_path; } - if ($ok) + if ($is_valid_dir) { // Add the base style directory as a safe directory $this->twig->getLoader()->addSafeDirectory($ext_style_path); |