Projet

Général

Profil

Révision 5136ce55

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_sso/ldap_sso.module
66 66
        }
67 67

  
68 68
        require_once DRUPAL_ROOT . '/includes/common.inc';
69
        require_once DRUPAL_ROOT . '/includes/path.inc';
69
        require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc');
70 70
        $ldap_authentication_conf = variable_get('ldap_authentication_conf', array());
71 71

  
72 72
        if (isset($ldap_authentication_conf['seamlessLogin']) && $ldap_authentication_conf['seamlessLogin'] == 1 && ($login_attempted != 'true')) {
......
286 286
    global $user;
287 287
    $user = ldap_authentication_user_login_authenticate_validate(array(), $fake_form_state, TRUE);
288 288

  
289
    // Reload the account to ensure we have a fully populated user object.
290
    $user = user_load($user->uid);
291 289

  
292 290
    if ($detailed_watchdog_log) {
293 291
      $watchdog_tokens['!uid'] = is_object($user) ? $user->uid : NULL;
......
295 293
    }
296 294

  
297 295
    if ($user && $user->uid > 0) {
296
      // Reload the account to ensure we have a fully populated user object.
297
      $user = user_load($user->uid);
298

  
298 299
      if ($auth_conf->seamlessLogin == 1) {
299 300
        if ($detailed_watchdog_log) {
300 301
          watchdog('ldap_authentication', 'ldap_sso_user_login_sso.remote_user.user_success.seamlessLogin', $watchdog_tokens, WATCHDOG_DEBUG);

Formats disponibles : Unified diff