From e92552eb8bc6492c8f5602c19c4d56689bfbf75d Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 24 Nov 2010 00:08:49 -0700
Subject: [PATCH] Fix deleting user flag

---
 imp/lib/Imap/Flags.php | 3 ++-
 imp/lib/Prefs/Ui.php   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/imp/lib/Imap/Flags.php b/imp/lib/Imap/Flags.php
index 2ed8a833c..80784c413 100644
--- a/imp/lib/Imap/Flags.php
+++ b/imp/lib/Imap/Flags.php
@@ -246,8 +246,9 @@ class IMP_Imap_Flags
         if (isset($this->_flags[$label]) &&
             $this->_flags[$label]['l'] &&
             !empty($this->_flags[$label]['d'])) {
+            $user_flag = isset($this->_userflags[$label]);
             unset($this->_flags[$label], $this->_userflags[$label]);
-            $this->_save();
+            $this->_save($user_flag);
             return true;
         }
 
diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index 7bd54e533..6d915d9dd 100644
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -994,8 +994,8 @@ class IMP_Prefs_Ui
 
             switch ($ui->vars->flag_action) {
             case 'delete':
-                if ($ui->vars->flag_data == ('bg_' . $md5)) {
-                    $imp_flags->deleteFlag($key);
+                if (($ui->vars->flag_data == ('bg_' . $md5)) &&
+                    $imp_flags->deleteFlag($key)) {
                     $GLOBALS['notification']->push(sprintf(_("Deleted flag \"%s\"."), $val['l']), 'horde.success');
                 }
                 break;
-- 
2.11.0