Fix empty messages list when register_globals is enabled (#1489157)

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;
     }