Projet

Général

Profil

Révision 7547bb19

Ajouté par Assos Assos il y a environ 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_servers/ldap_servers.tokens.inc
368 368
          $token_keys[] = 'property.' . drupal_strtolower($property_name);
369 369
        }
370 370
      }
371
      elseif (isset($user_account->{$attr_name}['und'][0]['value']) && is_scalar($user_account->{$attr_name}['und'][0]['value'])) {
371
      elseif (isset($user_account->{$attr_name}[LANGUAGE_NONE][0]['value']) && is_scalar($user_account->{$attr_name}[LANGUAGE_NONE][0]['value'])) {
372 372
        $token_keys[] = 'field.' . $property_name;
373 373
        if (drupal_strtolower($property_name) != $property_name) {
374 374
          $token_keys[] = 'field.' . drupal_strtolower($property_name);
......
395 395

  
396 396
    switch ($attr_type) {
397 397
      case 'field':
398
        $value = @is_scalar($user_account->{$attr_name}['und'][0]['value']) ? $user_account->{$attr_name}['und'][0]['value'] : '';
398
        $value = @is_scalar($user_account->{$attr_name}[LANGUAGE_NONE][0]['value']) ? $user_account->{$attr_name}[LANGUAGE_NONE][0]['value'] : '';
399 399
      break;
400 400

  
401 401
      case 'property':
......
444 444
          break;
445 445
      }
446 446

  
447
      $tokens[$pre . $token_key . $post] = check_plain($value);
447
      $tokens[$pre . $token_key . $post] = ($attr_type == 'password') ? $value : check_plain($value);
448 448
      if ($token_key != drupal_strtolower($token_key)) {
449
        $tokens[$pre . drupal_strtolower($token_key) . $post] = check_plain($value);
449
        $tokens[$pre . drupal_strtolower($token_key) . $post] = ($attr_type == 'password') ? $value : check_plain($value);
450 450
      }
451 451
    }
452 452
  }

Formats disponibles : Unified diff