[mms] Fix expiring session cached mailbox data when mailbox informati…

…on changes.
horde · Aug 6, 2014 · 71b0f97 · 71b0f97
1 parent c1dd0d4
commit 71b0f97
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,8 @@
 v6.2.2-git
 ----------
 
+[mms] Fix expiring session cached mailbox data when mailbox information
+      changes.
 [mms] Fix updating viewport immediately after deleting messages on POP3
       servers.
 

diff --git a/imp/lib/Mailbox/SessionCache.php b/imp/lib/Mailbox/SessionCache.php
@@ -354,21 +354,19 @@ public function expire($entries, $mbox = null)
             case self::CACHE_LABEL:
             case self::CACHE_PREFTO:
             case self::CACHE_UIDVALIDITY:
-                if ($mbox) {
-                    $mbox = strval($mbox);
-                    if (($c = isset($this->_cache[$val][$mbox])) ||
-                        isset($this->_temp[$val][$mbox])) {
-                        if ($c) {
-                            $this->_changed = self::CHANGED_YES;
-                        }
-                        unset(
-                            $this->_cache[$val][$mbox],
-                            $this->_temp[$val][$mbox]
-                        );
+                $mbox = $mbox
+                    ? array(strval($mbox))
+                    : array_merge(array_keys($this->_cache), array_keys($this->_temp));
+                foreach ($mbox as $val2) {
+                    if (isset($this->_cache[$val2][$val])) {
+                        $this->_changed = self::CHANGED_YES;
                     }
-                    break;
+                    unset(
+                        $this->_cache[$val2][$val],
+                        $this->_temp[$val2][$val]
+                    );
                 }
-                // Fall-through
+                break;
 
             case self::CACHE_ICONHOOK:
             case self::CACHE_SPECIALMBOXES:

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [mms] Fix expiring session cached mailbox data when mailbox information changes.
 * [mms] Fix updating viewport immediately after deleting messages on POP3 servers.
  </notes>
  <contents>
@@ -3721,6 +3722,7 @@
    <date>2014-08-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Fix expiring session cached mailbox data when mailbox information changes.
 * [mms] Fix updating viewport immediately after deleting messages on POP3 servers.
    </notes>
   </release>