summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-06-05 07:42:45 +0000
committeralecpl <alec@alec.pl>2011-06-05 07:42:45 +0000
commit9382b6dfe1521bd5e7f7006ad9ba43315cc7d2e5 (patch)
tree667547be66108443379efcf0d251235854649b80 /program/steps
parentb0c70b3ca7127b9028e666f15e24261414d3caa0 (diff)
- Fix contacts import (#1487947)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/addressbook/func.inc8
-rw-r--r--program/steps/addressbook/search.inc3
2 files changed, 4 insertions, 7 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 62fde971c..8b7e641d8 100644
--- a/program/steps/addressbook/func.inc
+++ b/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/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index fff6bd66c..498e9b222 100644
--- a/program/steps/addressbook/search.inc
+++ b/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