From 4da065e8a94684530ea7f863b85e2c97c0cdb600 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 27 Jan 2014 04:08:35 -0500
Subject: [PATCH] Check/create default folders on every login not only the first (#1489423)
---
CHANGELOG | 1 +
program/include/rcmail.php | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index cc8838d..e99c673 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Check/create default folders on every login not only the first (#1489423)
- Update to jQuery-1.11.0 and jQuery-UI-1.9.2
- Support SMTP socket context options via new config option 'smtp_conn_options'
- Fix compatibility with PHP 5.2 in html.php file (#1489514)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index a927b79..bb42cab 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -634,14 +634,6 @@
$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 @@
$_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;
--
Gitblit v1.9.1