summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-02-10 13:18:34 +0100
committerThomas Bruederli <thomas@roundcube.net>2014-02-10 13:18:34 +0100
commitce2019426600b8d235c0e60cb4b1223eb984e311 (patch)
treed80cc2fe33589f70e1412fefc62ff95e94677948 /program/include
parentc8699f09eae6265e566a18c4597334d363aa4492 (diff)
Add setter for user object to rcube class; we already have getters for various user properties there
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php11
1 files changed, 3 insertions, 8 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index f4013d3d8..d1b544135 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -5,8 +5,8 @@
| program/include/rcmail.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2013, The Roundcube Dev Team |
- | Copyright (C) 2011-2013, Kolab Systems AG |
+ | Copyright (C) 2008-2014, The Roundcube Dev Team |
+ | Copyright (C) 2011-2014, Kolab Systems AG |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -157,12 +157,7 @@ class rcmail extends rcube
*/
public function set_user($user)
{
- if (is_object($user)) {
- $this->user = $user;
-
- // overwrite config with user preferences
- $this->config->set_user_prefs((array)$this->user->get_prefs());
- }
+ parent::set_user($user);
$lang = $this->language_prop($this->config->get('language', $_SESSION['language']));
$_SESSION['language'] = $this->user->language = $lang;