21,43c21,43
<     $fields = array('id'        => 'id',
<                     'username'  => 'username',
<                     'email'     => 'email',
<                     'firstname' => 'firstname',
<                     'lastname'  => 'lastname',
<                     'idnumber'  => 'idnumber',
<                     'institution' => 'institution',
<                     'department' => 'department',
<                     'phone1'    => 'phone1',
<                     'phone2'    => 'phone2',
<                     'city'      => 'city',
<                     'url'       => 'url',
<                     'icq'       => 'icq',
<                     'skype'     => 'skype',
<                     'aim'       => 'aim',
<                     'yahoo'     => 'yahoo',
<                     'msn'       => 'msn',
<                     'country'   => 'country');
< 
<     if ($extrafields = get_records_select('user_info_field')) {
<         foreach ($extrafields as $n=>$v){
<             $fields['profile_field_'.$v->shortname] = 'profile_field_'.$v->shortname;
<         }
---
>     $builtins_fields = array('id'          => 'id',
>                              'username'    => 'username',
>                              'email'       => 'email',
>                              'firstname'   => 'firstname',
>                              'lastname'    => 'lastname',
>                              'idnumber'    => 'idnumber',
>                              'institution' => 'institution',
>                              'department'  => 'department',
>                              'phone1'      => 'phone1',
>                              'phone2'      => 'phone2',
>                              'city'        => 'city',
>                              'url'         => 'url',
>                              'icq'         => 'icq',
>                              'skype'       => 'skype',
>                              'aim'         => 'aim',
>                              'yahoo'       => 'yahoo',
>                              'msn'         => 'msn',
>                              'country'     => 'country');
> 
>     $extrafields = get_records_select('user_info_field');
>     $fields = $builtins_fields;
>     foreach ($extrafields as $n=>$v){
>         $fields['profile_field_'.$v->shortname] = 'profile_field_'.$v->shortname;
47c47
<         case 'csv' : user_download_csv($fields);
---
>         case 'csv' : user_download_csv($builtins_fields, $extrafields);
146c146
< function user_download_csv($fields) {
---
> function user_download_csv($fields, $extrafields) {
165a166,169
>     foreach ($extrafields as $n=>$v){
>         $row['profile_field_'.$v->shortname] = 'profile_field_'.$v->shortname;
>     }
> 
175c179,185
<             $row[] = str_replace($delimiter, $encdelim, $user->$field);
---
>             $row[] = '"'.str_replace($delimiter, $encdelim, $user->$field).'"';
>         }
>         foreach ($extrafields as $field) {
>             require_once($CFG->dirroot.'/user/profile/field/'.$field->datatype.'/field.class.php');
>             $newfield = 'profile_field_'.$field->datatype;
>             $formfield = new $newfield($field->id, $userid);
>             $row[] = '"'.$formfield->data.'"';
178a189
>