Projet

Général

Profil

Révision 018e218c

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

Weekly update of contrib modules

Voir les différences:

htmltest/sites/all/modules/flag/includes/flag/flag_entity.inc
180 180
  function get_labels_token_types() {
181 181
    // The token type name might be different to the entity type name. If so,
182 182
    // an own flag entity handler can be used for overriding this.
183
    return array_merge(array($this->entity_type), parent::get_labels_token_types());
183
    $entity_info = entity_get_info($this->entity_type);
184
    if (isset($entity_info['token type'])) {
185
      return array_merge(array($entity_info['token type']), parent::get_labels_token_types());
186
    }
187
    else {
188
      return array_merge(array($this->entity_type), parent::get_labels_token_types());
189
    }
184 190
  }
185 191

  
186 192
  /**

Formats disponibles : Unified diff