Projet

Général

Profil

Révision d7c661a9

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/file_entity/file_entity.admin.inc
1105 1105
    '#type' => 'textfield',
1106 1106
    '#title' => t('Default allowed file extensions'),
1107 1107
    '#default_value' => variable_get('file_entity_default_allowed_extensions', 'jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp mp3 mov mp4 m4a m4v mpeg avi ogg oga ogv weba webp webm'),
1108
    '#description' => t('Separate extensions with a space or comma and do not include the leading dot.'),
1108
    '#description' => t('Separate extensions with a space and do not include the leading dot.'),
1109 1109
    '#maxlength' => NULL,
1110 1110
  );
1111 1111

  
drupal7/sites/all/modules/file_entity/file_entity.file.inc
287 287
    if (!empty($alt)) {
288 288
      $output = token_replace($alt, array('file' => $file), $replace_options);
289 289

  
290
      // @todo Remove once https://www.drupal.org/node/1713164 is fixed.
291
      // There is currently no way to get the raw alt text returned from the
292
      // token so we revert the encoding done during tokenization.
293
      $file->alt = decode_entities($output);
290
      if (!empty($output)) {
291
        // @todo Remove once https://www.drupal.org/node/1713164 is fixed.
292
        // There is currently no way to get the raw alt text returned from the
293
        // token so we revert the encoding done during tokenization.
294
        $file->alt = decode_entities($output);
295
      }
294 296
    }
295 297
    if (!empty($title)) {
296 298
      $output = token_replace($title, array('file' => $file), $replace_options);
297 299

  
298
      // @todo Remove once https://www.drupal.org/node/1713164 is fixed.
299
      // There is currently no way to get the raw title text returned from the
300
      // token so we revert the encoding done during tokenization.
301
      $file->title = decode_entities($output);
300
      if (!empty($output)) {
301
        // @todo Remove once https://www.drupal.org/node/1713164 is fixed.
302
        // There is currently no way to get the raw title text returned from the
303
        // token so we revert the encoding done during tokenization.
304
        $file->title = decode_entities($output);
305
      }
302 306
    }
303 307
  }
304 308
}
drupal7/sites/all/modules/file_entity/file_entity.info
32 32
; We have to add a fake version so Git checkouts do not fail Media dependencies
33 33
version = 7.x-2.x-dev
34 34

  
35
; Information added by Drupal.org packaging script on 2017-10-18
36
version = "7.x-2.11"
35
; Information added by Drupal.org packaging script on 2017-10-31
36
version = "7.x-2.12"
37 37
core = "7.x"
38 38
project = "file_entity"
39
datestamp = "1508346687"
39
datestamp = "1509415090"
40 40

  
drupal7/sites/all/modules/file_entity/tests/file_entity_test.info
5 5
dependencies[] = file_entity
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2017-10-18
9
version = "7.x-2.11"
8
; Information added by Drupal.org packaging script on 2017-10-31
9
version = "7.x-2.12"
10 10
core = "7.x"
11 11
project = "file_entity"
12
datestamp = "1508346687"
12
datestamp = "1509415090"
13 13

  

Formats disponibles : Unified diff