Project

General

Profile

Revision b42754b9

Added by Assos Assos almost 7 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/ldap/ldap_authentication/ldap_authentication.inc
49 49

  
50 50
    $form['links']['#markup'] = theme('ldap_authentication_user_login_block_links', $vars);
51 51
  }
52
  ldap_servers_disable_http_check($form);
53 52

  
54 53
  // Add help information for entering in username/password
55 54
  $auth_conf = ldap_authentication_get_valid_conf();
......
391 390
  if (!$drupal_account_exists) {
392 391

  
393 392
    // VI.C.1 Do not provision Drupal account if another account has same email.
394
    if ($account_with_same_email = user_load_by_mail($ldap_user['mail'])) {
393
    if (($auth_conf->ldapUser->acctCreation == LDAP_USER_ACCOUNTS_WITH_SAME_EMAIL_DISABLED) && ($account_with_same_email = user_load_by_mail($ldap_user['mail']))) {
395 394
      $error = TRUE;
396 395
      /**
397 396
       * username does not exist but email does.  Since user_external_login_register does not deal with

Also available in: Unified diff