Small improvements

pull/298/head
Aleksander Machniak 9 years ago
parent b87a794348
commit 8716fca0d0

@ -773,7 +773,7 @@ function rcmail_check_safe(&$message)
// get default addressbook, like in addcontact.inc
$CONTACTS = $RCMAIL->get_address_book(-1, true);
if ($CONTACTS) {
if ($CONTACTS && $message->sender['mailto']) {
$result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
if ($result->count) {
$message->set_safe(true);

@ -329,7 +329,7 @@ function rcmail_contact_exists($email)
$CONTACTS = $RCMAIL->get_address_book(-1, true);
if (is_object($CONTACTS)) {
$existing = $CONTACTS->search('email', $email, true, false);
$existing = $CONTACTS->search('email', $email, 1, false);
if ($existing->count) {
return true;
}

Loading…
Cancel
Save