diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-02 19:44:37 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-02 19:44:37 +0000 |
| commit | 043842ed7e5b570aa54aac584baafeb6956556bc (patch) | |
| tree | 4e5b1fa4316a6821ff611016eaf1ad2e161617ee /roundcubemail/program | |
| parent | 147a0ce90af35c05bea0cb07bcf3ef7030428962 (diff) | |
Always update $CONFIG with user prefs (#1484729)
git-svn-id: https://svn.roundcube.net/trunk@997 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 7892d0924..792a316cc 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -92,8 +92,7 @@ function rcmail_startup($task='mail') $USER = new rcube_user($_SESSION['user_id']); // overwrite config with user preferences - if (is_array($_SESSION['user_prefs'])) - $CONFIG = array_merge($CONFIG, $_SESSION['user_prefs']); + $CONFIG = array_merge($CONFIG, (array)$USER->get_prefs()); // reset some session parameters when changing task @@ -591,7 +590,7 @@ function rcmail_login($user, $pass, $host=NULL) // query if user already registered if ($existing = rcube_user::query($user, $host)) - $USER = $existing; + $USER = $existing; // user already registered -> overwrite username if ($USER->ID) @@ -608,8 +607,7 @@ function rcmail_login($user, $pass, $host=NULL) if ($USER->ID) { // get user prefs - $_SESSION['user_prefs'] = $USER->get_prefs(); - array_merge($CONFIG, $_SESSION['user_prefs']); + $CONFIG = array_merge($CONFIG, (array)$USER->get_prefs()); // set user specific language if (!empty($USER->data['language'])) |