diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-09-09 20:23:56 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-09-09 20:23:56 +0200 |
| commit | 99d9f50a0000447d0a752e6c43716237dc0da176 (patch) | |
| tree | 0b958b9711d09c4da74f076e1b902ffa32a4a0a1 /program/steps/addressbook | |
| parent | a1303514933afe2d867067e4b95412c79652c89b (diff) | |
| parent | 4e383e2ec8b4184c0fe74d02cf30fd3a4078128e (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/addressbook')
| -rw-r--r-- | program/steps/addressbook/export.inc | 2 | ||||
| -rw-r--r-- | program/steps/addressbook/search.inc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc index 84a63aebc..850795c85 100644 --- a/program/steps/addressbook/export.inc +++ b/program/steps/addressbook/export.inc @@ -86,7 +86,7 @@ while ($result && ($row = $result->next())) { foreach ($row as $key => $values) { list($field, $section) = explode(':', $key); foreach ((array)$values as $value) { - if (is_array($value) || strlen($value)) + if (is_array($value) || @strlen($value)) $vcard->set($field, $value, strtoupper($section)); } } diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc index d31e54b1a..851325070 100644 --- a/program/steps/addressbook/search.inc +++ b/program/steps/addressbook/search.inc @@ -237,9 +237,12 @@ function rcmail_contact_search() $OUTPUT->command('set_env', 'source', ''); $OUTPUT->command('set_env', 'group', ''); - // unselect currently selected directory/group - if (!$sid) + if (!$sid) { + // unselect currently selected directory/group $OUTPUT->command('unselect_directory'); + // enable "Save search" command + $OUTPUT->command('enable_command', 'search-create', true); + } $OUTPUT->command('update_group_commands'); // send response |