Check rcube_addressbook::get_error() after failing delete (#1489463)

pull/157/head
Aleksander Machniak 11 years ago
parent 18b40c1a32
commit 2c16ab5682

@ -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();
}

Loading…
Cancel
Save