/drupal7/sites/all/modules/entity/entity_token.tokens.inc - Diff - Club Drupal - Forge Centrale Marseille

Révision 503b3f7b

Weekly update of contrib modules

             $wrapper = !isset($wrapper) ? _entity_token_wrap_data($type, $token_types[$type], $data[$type], $options) : $wrapper;
             $property_name = str_replace('-', '_', $name);
             try {
               $replacement = _entity_token_get_token($wrapper->$property_name, $options);
               if (isset($replacement)) {
                 $replacements[$original] = $replacement;
               if (isset($wrapper->$property_name)) {
                 $replacement = _entity_token_get_token($wrapper->$property_name, $options);
                 if (isset($replacement)) {
                   $replacements[$original] = $replacement;
+                }
+              }
+            }
             catch (EntityMetadataWrapperException $e) {
-...
      */
     function _entity_token_get_token($wrapper, $options) {
       if ($wrapper->value() === NULL) {
       if (!$wrapper || $wrapper->value() === NULL) {
         // Do not provide a replacement if there is no value.
         return NULL;
+      }

Formats disponibles : Unified diff