diff options
| author | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
| commit | afc12906b92c2cf126fa2ff9006583d0c4ef01ec (patch) | |
| tree | 0140929b3ddc902fb7f072af2425040d7a43d814 /phpBB/phpbb/user.php | |
| parent | dcf82d9a5ae26de462687325b4d8553e4aaca7d4 (diff) | |
| parent | aae7677d71112e468b56be7e10d16f3b381fcad7 (diff) | |
| download | forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.gz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.bz2 forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.xz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11628' into develop
Diffstat (limited to 'phpBB/phpbb/user.php')
| -rw-r--r-- | phpBB/phpbb/user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 656c17aadd..36120798e5 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -75,7 +75,7 @@ class phpbb_user extends phpbb_session */ function setup($lang_set = false, $style_id = false) { - global $db, $phpbb_style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; + global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; global $phpbb_dispatcher; if ($this->data['user_id'] != ANONYMOUS) @@ -251,7 +251,7 @@ class phpbb_user extends phpbb_session } } - $phpbb_style->set_style(); + $template->set_style(); $this->img_lang = $this->lang_name; |