summaryrefslogtreecommitdiff
path: root/program/steps/addressbook
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-05-30 11:35:28 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-05-30 11:35:28 +0200
commitca1c2a8c9c69ddf92cfd07a9e5ff4ec1deb22b6b (patch)
treef968d9b367a0081da1594472dc302217097e5b60 /program/steps/addressbook
parentdcf23b931677a4016fbfc1d078b8e0943d187917 (diff)
Don't show errors when moving contacts into groups they're already in (#1488493)
Diffstat (limited to 'program/steps/addressbook')
-rw-r--r--program/steps/addressbook/groups.inc4
1 files changed, 3 insertions, 1 deletions
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');
}
}