summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-01-27 10:08:35 +0100
committerAleksander Machniak <alec@alec.pl>2014-01-27 10:08:35 +0100
commit4da065e8a94684530ea7f863b85e2c97c0cdb600 (patch)
tree5d7285d9e15380922ec1169dac5299afd9c989b9 /program/include
parent2d3abfda48af66505fa654519e3415b2f366edb4 (diff)
Check/create default folders on every login not only the first (#1489423)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index a927b7946..bb42cab46 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -634,14 +634,6 @@ class rcmail extends rcube
$this->set_user($user);
$this->set_storage_prop();
- // fix some old settings according to namespace prefix
- $this->fix_namespace_settings($user);
-
- // create default folders on first login
- if ($config['create_default_folders'] && (!empty($created) || empty($user->data['last_login']))) {
- $storage->create_default_folders();
- }
-
// set session vars
$_SESSION['user_id'] = $user->ID;
$_SESSION['username'] = $user->data['username'];
@@ -655,7 +647,15 @@ class rcmail extends rcube
$_SESSION['timezone'] = rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_GPC);
}
- // force reloading complete list of subscribed mailboxes
+ // fix some old settings according to namespace prefix
+ $this->fix_namespace_settings($user);
+
+ // create default folders on login
+ if ($config['create_default_folders']) {
+ $storage->create_default_folders();
+ }
+
+ // clear all mailboxes related cache(s)
$storage->clear_cache('mailboxes', true);
return true;