From fd96f97dc3c659e1d2e9b58420d652ad79387fbf Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Mar 2012 21:11:34 +0200
Subject: [feature/merging-style-components] Updating style initialization
Changing template initialization to style initialization.
PHPBB3-10632
---
phpBB/includes/session.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'phpBB/includes/session.php')
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;
--
cgit v1.2.1