From f21a04c024e57d2396c6a8ab78b055de098217ee Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 10 Nov 2011 02:57:56 -0500
Subject: [PATCH] - Add option to define matching method for addressbook search (#1486564, #1487907)
---
program/steps/mail/addcontact.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index dafb276..a4feb7b 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -50,7 +50,7 @@
$OUTPUT->show_message('errorsavingcontact', 'error');
$OUTPUT->send();
}
-
+
$email = rcube_idn_to_ascii($contact['email']);
if (!check_email($email, false)) {
$OUTPUT->show_message('emailformaterror', 'error', array('email' => $contact['email']));
@@ -65,13 +65,13 @@
$error = $CONTACTS->get_error();
// TODO: show dialog to complete record
// if ($error['type'] == rcube_addressbook::ERROR_VALIDATE) { }
-
+
$OUTPUT->show_message($error['message'] ? $error['message'] : 'errorsavingcontact', 'error');
$OUTPUT->send();
}
// check for existing contacts
- $existing = $CONTACTS->search('email', $contact['email'], true, false);
+ $existing = $CONTACTS->search('email', $contact['email'], 1, false);
if ($done = $existing->count)
$OUTPUT->show_message('contactexists', 'warning');
--
Gitblit v1.9.1