diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-07-10 20:30:34 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-07-10 20:30:34 +0200 |
| commit | 840b4dbeb81603ed44c30dc77be8eff98d7667c3 (patch) | |
| tree | c1e7206aec71ae03ff05cbacdd5e724a5574afc1 /program/steps/mail/addcontact.inc | |
| parent | 2b21b97ef0b13c958ed53c7adf10f02f6c4c434f (diff) | |
Simplified method of getting default addressbook.
Make sure to use the same source when adding contact and checking
if message is safe (sender is in addressbook).
Small code improvements.
Diffstat (limited to 'program/steps/mail/addcontact.inc')
| -rw-r--r-- | program/steps/mail/addcontact.inc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc index 2dc406f84..380557766 100644 --- a/program/steps/mail/addcontact.inc +++ b/program/steps/mail/addcontact.inc @@ -23,17 +23,8 @@ if (!$OUTPUT->ajax_call) return; -$abook = $RCMAIL->config->get('default_addressbook'); - -// Get configured addressbook -$CONTACTS = $RCMAIL->get_address_book($abook, true); - -// Get first writeable addressbook if the configured doesn't exist -// This can happen when user deleted the addressbook (e.g. Kolab folder) -if ($abook == null || !is_object($CONTACTS)) { - $source = reset($RCMAIL->get_address_sources(true)); - $CONTACTS = $RCMAIL->get_address_book($source['id'], true); -} +// Get default addressbook +$CONTACTS = $RCMAIL->get_address_book(-1, true); if (!empty($_POST['_address']) && is_object($CONTACTS)) { |