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

Aleksander Machniak

2013-12-05 2c16ab5682fe60cc2da6d0ca57089208810a642d

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

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