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

Merge pull request #3314 from VSEphpbb/ticket/13133

Browse source 
[ticket/13133] Fix variable name in set_custom_style()

* VSEphpbb/ticket/13133:
  [ticket/13133] Fix variable name in set_custom_style()
This commit is contained in:
Tristan Darricau 2015-01-20 23:47:44 +01:00
commit 08e186af8e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/phpbb/template/twig/twig.php
View file

@ -285,19 +285,19 @@ class twig extends \phpbb\template\base
$ext_style_theme_path = $ext_style_path . 'theme/'; $ext_style_theme_path = $ext_style_path . 'theme/';
} }
$ok = false; $is_valid_dir = false;
if (is_dir($ext_style_template_path)) if (is_dir($ext_style_template_path))
{ {
$ok = true; $is_valid_dir = true;
$paths[] = $ext_style_template_path; $paths[] = $ext_style_template_path;
} }
if (is_dir($ext_style_theme_path)) if (is_dir($ext_style_theme_path))
{ {
$ok = true; $is_valid_dir = true;
$paths[] = $ext_style_theme_path; $paths[] = $ext_style_theme_path;
} }
if ($ok) if ($is_valid_dir)
{ {
// Add the base style directory as a safe directory // Add the base style directory as a safe directory
$this->twig->getLoader()->addSafeDirectory($ext_style_path); $this->twig->getLoader()->addSafeDirectory($ext_style_path);