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/ldap_user.module
738 738
  $ldap_user_conf = ldap_user_conf();
739 739
  $account = user_load_by_name($username);
740 740
  $user_edit = array();
741
  $ldap_user_conf->synchToDrupalAccount($account, $user_edit, $prov_event, $ldap_user, FALSE);
741
  $ldap_user_conf->synchToDrupalAccount($account, $user_edit, $prov_event, $ldap_user, TRUE);
742 742

  
743 743
}
744 744

  
......
891 891
      if ($ldap_user) {
892 892
        $ldap_server = ldap_servers_get_servers($ldap_user_conf->drupalAcctProvisionServer, NULL, TRUE);
893 893
        $ldap_user_conf->entryToUserEdit($ldap_user, $user_edit, $ldap_server, LDAP_USER_PROV_DIRECTION_TO_DRUPAL_USER, array(LDAP_USER_EVENT_SYNCH_TO_DRUPAL_USER));
894
        if (empty($account->picture->fid)) { // see #1973352 and #935592
895
          $account2 = user_load($account->uid);
896
          $account->picture = $account2->picture;
897
        }
898
        $account = user_save($account, $user_edit, 'ldap_user');
894 899
      }
895

  
896
      if (empty($account->picture->fid)) { // see #1973352 and #935592
897
        $account2 = user_load($account->uid);
898
        $account->picture = $account2->picture;
899
      }
900
      $account = user_save($account, $user_edit, 'ldap_user');
901 900
    }
902 901
  }
903 902

  

Formats disponibles : Unified diff