diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-02 11:50:13 +0300 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-11 19:56:50 -0400 |
| commit | 71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b (patch) | |
| tree | 212afadc0d7cd715a97fba1a29094067c1eb6765 /phpBB/includes/user.php | |
| parent | 33b72ec62bd8b6e6c890e4c474d28389f048632a (diff) | |
| download | forums-71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b.tar forums-71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b.tar.gz forums-71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b.tar.bz2 forums-71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b.tar.xz forums-71ca9b4fe69dea8150a5d3c6f30dd177c488ff2b.zip | |
[ticket/10743] Renaming user->theme
Renaming user->theme to user->style
PHPBB3-10743
Diffstat (limited to 'phpBB/includes/user.php')
| -rw-r--r-- | phpBB/includes/user.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index 1db2364f76..cf9e6b9994 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -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]); } } |