dimp folder add/remove fixes

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 6df32fa..09e42fe 100644 (file)
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -2011,6 +2011,10 @@ var DimpBase = {
     deleteFolderElt: function(fid, sub)
     {
         var f = $(fid), submbox;
+        if (!f) {
+            return;
+        }
+
         if (sub) {
             submbox = $(this.getSubFolderId(fid));
             if (submbox) {

diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index bb6d473..f9cfd1e 100644 (file)
--- a/imp/lib/Imap/Tree.php
+++ b/imp/lib/Imap/Tree.php
@@ -759,7 +759,9 @@ class IMP_Imap_Tree
             // This is a case where it is possible that the parent element has
             // changed (it now has children) but we can't catch it via the
             // bitflag (since hasChildren() is dynamically determined).
-            if ($this->_trackdiff && !is_null($this->_eltdiff)) {
+            if ($this->_trackdiff &&
+                !is_null($this->_eltdiff) &&
+                !isset($this->_eltdiff['a'][$elt['p']])) {
                 $this->_eltdiff['c'][$elt['p']] = 1;
             }
         }