aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-03-15 21:11:34 +0200
committerVjacheslav Trushkin <arty@phpbb.com>2012-03-15 21:11:34 +0200
commitfd96f97dc3c659e1d2e9b58420d652ad79387fbf (patch)
tree96bc528157271485983689b59967c5692f2fc21d /phpBB/includes/session.php
parent1ce4d4c4fc482f33fd061c4f718b4f8c3656dbdb (diff)
downloadforums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar
forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.gz
forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.bz2
forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.xz
forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.zip
[feature/merging-style-components] Updating style initialization
Changing template initialization to style initialization. PHPBB3-10632
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index f2956243e2..2fd2efe9b2 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1570,7 +1570,7 @@ class user extends session
*/
function setup($lang_set = false, $style_id = false)
{
- global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
+ global $db, $style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
if ($this->data['user_id'] != ANONYMOUS)
{
@@ -1704,7 +1704,7 @@ class user extends session
}
}
- $template->set_template();
+ $style->set_style();
$this->img_lang = $this->lang_name;