diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-06-25 18:37:19 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-06-25 18:37:19 +0200 |
commit | a5b79b15a8cd125feacd757df98bc72e93404fd6 (patch) | |
tree | faef43e8b63c8f707e3bd878bf0dbd94d3368eba /program/steps/mail/search_contacts.inc | |
parent | d7604c8c5907bdb3a7fbab1bd139a844293f1116 (diff) |
Fix empty messages list when register_globals is enabled (#1489157)
Diffstat (limited to 'program/steps/mail/search_contacts.inc')
-rw-r--r-- | program/steps/mail/search_contacts.inc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/program/steps/mail/search_contacts.inc b/program/steps/mail/search_contacts.inc index 2e6bb12f8..6a30ad1f5 100644 --- a/program/steps/mail/search_contacts.inc +++ b/program/steps/mail/search_contacts.inc @@ -19,16 +19,15 @@ +-----------------------------------------------------------------------+ */ -$search = get_input_value('_q', RCUBE_INPUT_GPC, true); -$sources = $RCMAIL->get_address_sources(); -$search_mode = (int) $RCMAIL->config->get('addressbook_search_mode'); -$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name'); -$afields = $RCMAIL->config->get('contactlist_fields'); +$search = get_input_value('_q', RCUBE_INPUT_GPC, true); +$sources = $RCMAIL->get_address_sources(); +$search_mode = (int) $RCMAIL->config->get('addressbook_search_mode'); +$addr_sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name'); +$afields = $RCMAIL->config->get('contactlist_fields'); +$page_size = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50)); +$records = array(); +$search_set = array(); -$page = 1; -$page_size = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50)); - -$records = $search_set = array(); foreach ($sources as $s) { $source = $RCMAIL->get_address_book($s['id']); $source->set_page(1); @@ -46,7 +45,7 @@ foreach ($sources as $s) { while ($row = $result->next()) { $row['sourceid'] = $s['id']; - $key = rcube_addressbook::compose_contact_key($row, $sort_col); + $key = rcube_addressbook::compose_contact_key($row, $addr_sort_col); $records[$key] = $row; } |