aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-01 14:42:05 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-01 14:42:05 -0500
commit1a58d188aab0c22965732621c8d93a00ea7a747e (patch)
tree7c25e5d6c6d99fdd091668793c1f40d61f796630 /phpBB/includes
parentd7cff78443465a06d6aab519c3285a9b20b6cd50 (diff)
downloadforums-1a58d188aab0c22965732621c8d93a00ea7a747e.tar
forums-1a58d188aab0c22965732621c8d93a00ea7a747e.tar.gz
forums-1a58d188aab0c22965732621c8d93a00ea7a747e.tar.bz2
forums-1a58d188aab0c22965732621c8d93a00ea7a747e.tar.xz
forums-1a58d188aab0c22965732621c8d93a00ea7a747e.zip
[feature/twig] Prevent errors from empty user->style
PHPBB3-11598
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/template/twig/twig.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index b5fb8eb860..3cd37e04e9 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -186,7 +186,7 @@ class phpbb_template_twig implements phpbb_template
$this->twig->getLoader()->setPaths($style_paths);
// Core style namespace from phpbb_style::set_style()
- if ($this->user && ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path']))
+ if (isset($this->user->style['style_path']) && ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path']))
{
$this->twig->getLoader()->setPaths($style_paths, 'core');
}