From 2c16ab5682fe60cc2da6d0ca57089208810a642d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 5 Dec 2013 12:46:23 +0100
Subject: Check rcube_addressbook::get_error() after failing delete (#1489463)

---
 program/steps/addressbook/delete.inc | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index 3bb2ef500..b69d519ac 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -51,7 +51,17 @@ foreach ($cids as $source => $cid)
     $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();
     }
-- 
cgit v1.2.3