/[drupal]/contributions/modules/user_import/supported/user.inc
ViewVC logotype

Diff of /contributions/modules/user_import/supported/user.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.7, Sun Sep 20 02:02:13 2009 UTC revision 1.1.2.8, Sun Sep 20 12:01:12 2009 UTC
# Line 99  function user_user_import_pre_save($sett Line 99  function user_user_import_pre_save($sett
99                  if ($update_setting_per_module['password'] == UPDATE_REPLACE) {                  if ($update_setting_per_module['password'] == UPDATE_REPLACE) {
100          $account_add['pass'] = (empty($fields['user']['password'][0])) ? user_password() : $fields['user']['password'][0];          $account_add['pass'] = (empty($fields['user']['password'][0])) ? user_password() : $fields['user']['password'][0];
101                  }                  }
102                    else {
103                            $account_add['pass'] = "";
104                    }
105    
106                  // update contact                  // update contact
107                  if ($update_setting_per_module['contact'] == UPDATE_REPLACE) {                  if ($update_setting_per_module['contact'] == UPDATE_REPLACE) {
108          $account_add['contact'] = $settings['contact'];                          $account_add['contact'] = $settings['contact'];
109                    }
110                    else {
111                            $account_add['contact'] = $account['contact'];
112                  }                  }
113    
114          }          }
# Line 248  function user_user_import_after_save($se Line 254  function user_user_import_after_save($se
254    /**    /**
255     * @todo change hook_user_import_after_save() so that all changes to data are returned and saved in one hit     * @todo change hook_user_import_after_save() so that all changes to data are returned and saved in one hit
256     */     */
257    user_save($account, array('contact' => $settings['contact']));  
258          user_user_import_after_save_role($account, $settings['roles_new'], $account->roles, $fields['user']['roles']);          user_user_import_after_save_role($account, $settings['roles_new'], $account->roles, $fields['user']['roles']);
259    return;    return;
260  }  }
# Line 329  function user_user_import_after_save_rol Line 335  function user_user_import_after_save_rol
335    
336    
337    
338    
339    
340    
341    
342    
343    
Legend:
Removed from v.1.1.2.7  
changed lines
  Added in v.1.1.2.8
  ViewVC Help
Powered by ViewVC 1.1.2