Projet

Général

Profil

Révision dd54aff9

Ajouté par Assos Assos il y a plus de 10 ans

Weekly update of contrib modules

Voir les différences:

htmltest/sites/all/modules/ldap/ldap_user/LdapUserConf.class.php
767 767
   *
768 768
   */
769 769
  public function synchToDrupalAccount($drupal_user, &$user_edit, $prov_event = LDAP_USER_EVENT_SYNCH_TO_DRUPAL_USER, $ldap_user = NULL,  $save = FALSE) {
770

  
770
    
771 771
    $debug = array(
772 772
      'account' => $drupal_user,
773 773
      'user_edit' => $user_edit,
......
1036 1036
      $user_edit['name'] = $account->name;
1037 1037
      $watchdog_tokens['%username'] = $user_edit['name'];
1038 1038
    }
1039
    if ($this->drupalAcctProvisionServer) {
1039
    //When using the multi-domain last authentication option
1040
    //$ldap_server breaks beacause $this->drupalAcctProvisionServer is set on LDAP_USER_AUTH_SERVER_SID
1041
    //So we need to check it's not the case before using ldap_servers_get_servers
1042
    if ($this->drupalAcctProvisionServer && $this->drupalAcctProvisionServer != LDAP_USER_AUTH_SERVER_SID) {
1040 1043

  
1041 1044
      $ldap_server = ldap_servers_get_servers($this->drupalAcctProvisionServer, 'enabled', TRUE);  // $ldap_user['sid']
1042 1045

  

Formats disponibles : Unified diff