diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-06-05 07:42:45 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-06-05 07:42:45 +0000 |
| commit | 1967feae9b920dacea3ddae08fb3614c183f631d (patch) | |
| tree | 195fe628142e0a0ba89815ad633667990955a26c /roundcubemail/program/steps | |
| parent | 9eacff7b8b0741aeb209260312cfeb18dd85dd7a (diff) | |
- Fix contacts import (#1487947)
git-svn-id: https://svn.roundcube.net/trunk@4841 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
| -rw-r--r-- | roundcubemail/program/steps/addressbook/func.inc | 8 | ||||
| -rw-r--r-- | roundcubemail/program/steps/addressbook/search.inc | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc index 62fde971c..8b7e641d8 100644 --- a/roundcubemail/program/steps/addressbook/func.inc +++ b/roundcubemail/program/steps/addressbook/func.inc @@ -50,14 +50,10 @@ else if (!empty($_REQUEST['_gid'])) $CONTACTS->set_group(get_input_value('_gid', RCUBE_INPUT_GPC)); -/* -// set message set for search result -if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) - $CONTACTS->set_search_set($_SESSION['search'][$_REQUEST['_search']]); -*/ + // set data source env $OUTPUT->set_env('source', $source ? $source : '0'); -$OUTPUT->set_env('readonly', $CONTACTS->readonly, false); +$OUTPUT->set_env('readonly', $CONTACTS->readonly); if (!$OUTPUT->ajax_call) { $search_mods = $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT); $OUTPUT->set_env('search_mods', $search_mods); diff --git a/roundcubemail/program/steps/addressbook/search.inc b/roundcubemail/program/steps/addressbook/search.inc index fff6bd66c..498e9b222 100644 --- a/roundcubemail/program/steps/addressbook/search.inc +++ b/roundcubemail/program/steps/addressbook/search.inc @@ -72,7 +72,8 @@ function rcmail_contact_search() } // search request ID - $search_request = md5('addr'.implode($fields, ',') + $search_request = md5('addr' + .(is_array($fields) ? implode($fields, ',') : $fields) .(is_array($search) ? implode($search, ',') : $search)); // reset page |