From 2c16ab5682fe60cc2da6d0ca57089208810a642d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 05 Dec 2013 06:46:23 -0500
Subject: [PATCH] Check rcube_addressbook::get_error() after failing delete (#1489463)
---
program/steps/addressbook/delete.inc | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index 3bb2ef5..b69d519 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -51,7 +51,17 @@
$deleted = !$plugin['abort'] ? $CONTACTS->delete($cid, $undo_time < 1) : $plugin['result'];
if (!$deleted) {
- $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'contactdelerror', 'error');
+ if ($plugin['message']) {
+ $error = $plugin['message'];
+ }
+ else if (($error = $CONTACTS->get_error()) && $error['message']) {
+ $error = $error['message'];
+ }
+ else {
+ $error = 'contactdelerror';
+ }
+
+ $OUTPUT->show_message($error, 'error');
$OUTPUT->command('list_contacts');
$OUTPUT->send();
}
--
Gitblit v1.9.1