mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 11:44:08 +02:00
Code Issues Releases Wiki Activity

[ticket/10743] Renaming user->theme

Browse Source 
Renaming user->theme to user->style

PHPBB3-10743
This commit is contained in:
Vjacheslav Trushkin
2012-04-02 11:50:13 +03:00
committed by Oleg Pudeyev
parent 33b72ec62b
commit 71ca9b4fe6
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/user.php
View File

@@ -27,7 +27,7 @@ class phpbb_user extends phpbb_session
{
var $lang = array();
var $help = array();
var $theme = array();
var $style = array();
var $date_format;
var $timezone;
var $dst;
@@ -159,11 +159,11 @@ class phpbb_user extends phpbb_session
FROM ' . STYLES_TABLE . " s
WHERE s.style_id = $style_id";
$result = $db->sql_query($sql, 3600);
$this->theme = $db->sql_fetchrow($result);
$this->style = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
// User has wrong style
if (!$this->theme && $style_id == $this->data['user_style'])
if (!$this->style && $style_id == $this->data['user_style'])
{
$style_id = $this->data['user_style'] = $config['default_style'];
@@ -176,17 +176,17 @@ class phpbb_user extends phpbb_session
FROM ' . STYLES_TABLE . " s
WHERE s.style_id = $style_id";
$result = $db->sql_query($sql, 3600);
$this->theme = $db->sql_fetchrow($result);
$this->style = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
}
if (!$this->theme)
if (!$this->style)
{
trigger_error('Could not get style data', E_USER_ERROR);
}
// Now parse the cfg file and cache it
$parsed_items = $cache->obtain_cfg_items($this->theme);
$parsed_items = $cache->obtain_cfg_items($this->style);
$check_for = array(
'pagination_sep' => (string) ', '
@@ -194,12 +194,12 @@ class phpbb_user extends phpbb_session
foreach ($check_for as $key => $default_value)
{
$this->theme[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value;
settype($this->theme[$key], gettype($default_value));
$this->style[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value;
settype($this->style[$key], gettype($default_value));
if (is_string($default_value))
{
$this->theme[$key] = htmlspecialchars($this->theme[$key]);
$this->style[$key] = htmlspecialchars($this->style[$key]);
}
}