From ca1c2a8c9c69ddf92cfd07a9e5ff4ec1deb22b6b Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 30 May 2012 11:35:28 +0200
Subject: Don't show errors when moving contacts into groups they're already in
 (#1488493)

---
 program/steps/addressbook/groups.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'program/steps')

diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc
index 3ce2bd0d3..b70453889 100644
--- a/program/steps/addressbook/groups.inc
+++ b/program/steps/addressbook/groups.inc
@@ -47,8 +47,10 @@ if ($RCMAIL->action == 'group-addmembers') {
 
     if ($result)
       $OUTPUT->show_message('contactaddedtogroup');
-    else
+    else if ($plugin['abort'] || $CONTACTS->get_error())
       $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+    else
+      $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'nogroupassignmentschanged');
   }
 }
 
-- 
cgit v1.2.3