[jan] Fix using ingo-convert-prefs-to-sql for multiple users.

horde · Aug 11, 2016 · 7feaf61 · 7feaf61
1 parent d5ec292
commit 7feaf61
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git 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
@@ -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
@@ -1716,6 +1716,9 @@
    <date>2016-07-01</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
+* [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.
    </notes>
   </release>