[mms] Fix double listing of mailboxes in certain instances when subsc…

…riptions are active and unsubscribed mailboxes are shown.
horde · Jan 16, 2015 · 8e015d3 · 8e015d3
1 parent c672e21
commit 8e015d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,8 @@
 v6.2.6-git
 ----------
 
+[mms] Fix double listing of mailboxes in certain instances when subscriptions
+      are active and unsubscribed mailboxes are shown.
 
 
 ------

diff --git a/imp/lib/Ftree.php b/imp/lib/Ftree.php
@@ -784,7 +784,9 @@ protected function _insertElt($elt)
         if (!isset($this->_parent[$parent])) {
             $this->eltdiff->change($p_elt);
         }
-        $this->_parent[$parent][] = $name;
+        if (!isset($this->_elts[$name])) {
+            $this->_parent[$parent][] = $name;
+        }
         $this->_elts[$name] = $elt['a'];
 
         if ($change) {

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [mms] Fix double listing of mailboxes in certain instances when subscriptions are active and unsubscribed mailboxes are shown.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3798,7 +3798,7 @@
    <date>2015-01-14</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [mms] Fix double listing of mailboxes in certain instances when subscriptions are active and unsubscribed mailboxes are shown.
    </notes>
   </release>
  </changelog>