From 0831201005e2af47455177c9b938d91a1e3b8155 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 4 Mar 2009 15:49:01 -0700
Subject: [PATCH] dimp folder add/remove fixes

---
 imp/js/src/DimpBase.js | 4 ++++
 imp/lib/Imap/Tree.php  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 6df32faa3..09e42fec7 100644
--- 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 bb6d473cb..f9cfd1e39 100644
--- 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;
             }
         }
-- 
2.11.0