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_user/LdapUserConf.class.php
594 594

  
595 595
        // need to store <sid>|<dn> in ldap_user_prov_entries field, which may contain more than one
596 596
        $ldap_user_prov_entry = $ldap_server->sid . '|' . $proposed_ldap_entry['dn'];
597
        if (!isset($user_entity->ldap_user_prov_entries['und'])) {
598
          $user_entity->ldap_user_prov_entries = array('und' => array());
597
        if (!isset($user_entity->ldap_user_prov_entries[LANGUAGE_NONE])) {
598
          $user_entity->ldap_user_prov_entries = array(LANGUAGE_NONE => array());
599 599
        }
600 600
        $ldap_user_prov_entry_exists = FALSE;
601
        foreach ($user_entity->ldap_user_prov_entries['und'] as $i => $field_value_instance) {
601
        foreach ($user_entity->ldap_user_prov_entries[LANGUAGE_NONE] as $i => $field_value_instance) {
602 602
          if ($field_value_instance == $ldap_user_prov_entry) {
603 603
            $ldap_user_prov_entry_exists = TRUE;
604 604
          }
605 605
        }
606 606
        if (!$ldap_user_prov_entry_exists) {
607
          $user_entity->ldap_user_prov_entries['und'][] = array(
607
          $user_entity->ldap_user_prov_entries[LANGUAGE_NONE][] = array(
608 608
            'value' =>  $ldap_user_prov_entry,
609 609
          );
610 610

  
......
867 867
    // determine server that is associated with user
868 868

  
869 869
    $boolean_result = FALSE;
870
    $language = ($account->language) ? $account->language : 'und';
870
    $language = ($account->language) ? $account->language : LANGUAGE_NONE;
871 871
    if (isset($account->ldap_user_prov_entries[$language][0])) {
872 872
      foreach ($account->ldap_user_prov_entries[$language] as $i => $field_instance) {
873 873
        $parts = explode('|', $field_instance['value']);

Formats disponibles : Unified diff