Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/steps/addressbook/list.inc

@@ -19,6 +19,8 @@
 +-----------------------------------------------------------------------+
*/

$afields = $RCMAIL->config->get('contactlist_fields');

// Use search result
if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
{
@@ -43,11 +45,11 @@
        $source->set_search_set($set);

        // get records
        $result = $source->list_records(array('name', 'firstname', 'surname', 'email'));
        $result = $source->list_records($afields);

        while ($row = $result->next()) {
            $row['sourceid'] = $s;
            $key = rcmail_contact_key($row, $sort_col);
            $key = rcube_addressbook::compose_contact_key($row, $sort_col);
            $records[$key] = $row;
        }
        unset($result);
@@ -73,12 +75,17 @@
    $CONTACTS = rcmail_contact_source(null, true);

    // get contacts for this user
    $result = $CONTACTS->list_records(array('name', 'firstname', 'surname', 'email'));
    $result = $CONTACTS->list_records($afields);

    if (!$result->count && $result->searchonly) {
        $OUTPUT->show_message('contactsearchonly', 'notice');
        $OUTPUT->command('command', 'advanced-search');
    }

    if ($CONTACTS->group_id) {
        $OUTPUT->command('set_group_prop', array('ID' => $CONTACTS->group_id)
            + array_intersect_key((array)$CONTACTS->get_group($CONTACTS->group_id), array('name'=>1,'email'=>1)));
    }
}

// update message count display