aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2015-01-20 23:47:44 +0100
committerTristan Darricau <github@nicofuma.fr>2015-01-20 23:47:44 +0100
commit08e186af8ed867c5d755d0fe979e5e9e46e3c09e (patch)
tree5b2bb65e14c0deaf2ee53be77f3fec4b701c6bef
parentf6057c5eabfa33aedf4183cd1327203ed8cce280 (diff)
parent41966c481fd0b9a9414f670c0297cdd5dd9ce60d (diff)
downloadforums-08e186af8ed867c5d755d0fe979e5e9e46e3c09e.tar
forums-08e186af8ed867c5d755d0fe979e5e9e46e3c09e.tar.gz
forums-08e186af8ed867c5d755d0fe979e5e9e46e3c09e.tar.bz2
forums-08e186af8ed867c5d755d0fe979e5e9e46e3c09e.tar.xz
forums-08e186af8ed867c5d755d0fe979e5e9e46e3c09e.zip
Merge pull request #3314 from VSEphpbb/ticket/13133
[ticket/13133] Fix variable name in set_custom_style() * VSEphpbb/ticket/13133: [ticket/13133] Fix variable name in set_custom_style()
-rw-r--r--phpBB/phpbb/template/twig/twig.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index db3a8e3571..bd754d9bbd 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -285,19 +285,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);