diff --git a/ingo/bin/ingo-convert-prefs-to-sql b/ingo/bin/ingo-convert-prefs-to-sql index 5dfce54c438..f5060b327de 100755 --- a/ingo/bin/ingo-convert-prefs-to-sql +++ b/ingo/bin/ingo-convert-prefs-to-sql @@ -49,6 +49,8 @@ while (!feof(STDIN)) { echo 'Converting filters for user: ' . $user; + $prefs_storage->clearCache(); + $sql_storage->clearCache(); $registry->setAuth($user, array()); $session->set('ingo', 'current_share', ':' . $user); diff --git a/ingo/lib/Storage.php b/ingo/lib/Storage.php index 0e684cca1af..ad51614324d 100644 --- a/ingo/lib/Storage.php +++ b/ingo/lib/Storage.php @@ -399,4 +399,13 @@ public function getIterator() return new ArrayIterator($this->_rules); } + /** + * Clears the internal rule cache. + * + * @since Ingo 3.2.12 + */ + public function clearCache() + { + $this->_cache = array(); + } } diff --git a/ingo/package.xml b/ingo/package.xml index f92074bb783..55ad558d7af 100644 --- a/ingo/package.xml +++ b/ingo/package.xml @@ -1716,6 +1716,9 @@ 2016-07-01 ASL +* [jan] Fix using ingo-convert-prefs-to-sql for multiple users. +* [mjr] Fix incorrect flag usage in Procmail vacation recipe (Bug #14397). +* [mjr] Fix escaping mailbox names that contain utf7-imap encodings (Bug #14429). * [jan] Fix creating new spam folders.