Projet

Général

Profil

Révision 1c42f191

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/media_youtube/includes/MediaInternetYouTubeHandler.inc
70 70
    // Try to default the file name to the video's title.
71 71
    if (empty($file->fid) && $info = $this->getOEmbed()) {
72 72
      $file->filename = truncate_utf8($info['title'], 255);
73
      foreach (array('width', 'height') as $setting) {
74
        if (!empty($info[$setting])) {
75
          $file->metadata[$setting] = $info[$setting];
76
        }
77
      }
73 78
    }
74 79

  
75 80
    return $file;
drupal7/sites/all/modules/media_youtube/includes/media_youtube.formatters.inc
68 68
    $display['settings']['attributes'] = array();
69 69

  
70 70
    foreach (array('width', 'height', 'autohide', 'autoplay', 'color', 'enablejsapi', 'loop', 'modestbranding', 'nocookie', 'origin', 'protocol', 'protocol_specify', 'rel', 'showinfo', 'theme', 'attributes', 'captions','controls') as $setting) {
71
      $element['#options'][$setting] = isset($file->override[$setting]) ? $file->override[$setting] : $display['settings'][$setting];
71
      $element['#options'][$setting] = isset($file->metadata[$setting]) ? $file->metadata[$setting]
72
        : (isset($file->override[$setting]) ? $file->override[$setting] : $display['settings'][$setting]);
72 73
    }
73 74

  
74 75
    return $element;
drupal7/sites/all/modules/media_youtube/media_youtube.info
11 11
files[] = includes/MediaYouTubeStreamWrapper.inc
12 12
files[] = includes/MediaInternetYouTubeHandler.inc
13 13

  
14
; Information added by Drupal.org packaging script on 2017-08-14
15
version = "7.x-3.5"
14
; Information added by Drupal.org packaging script on 2017-12-17
15
version = "7.x-3.6"
16 16
core = "7.x"
17 17
project = "media_youtube"
18
datestamp = "1502719245"
18
datestamp = "1513531688"
19 19

  
drupal7/sites/all/modules/media_youtube/tests/media_youtube_test.info
8 8
files[] = includes/MediaYouTubeTestStreamWrapper.inc
9 9
files[] = includes/MediaYouTubeTestHandler.inc
10 10

  
11
; Information added by Drupal.org packaging script on 2017-08-14
12
version = "7.x-3.5"
11
; Information added by Drupal.org packaging script on 2017-12-17
12
version = "7.x-3.6"
13 13
core = "7.x"
14 14
project = "media_youtube"
15
datestamp = "1502719245"
15
datestamp = "1513531688"
16 16

  
drupal7/sites/all/modules/media_youtube/themes/media-youtube-video.tpl.php
23 23

  
24 24
?>
25 25
<div class="<?php print $classes; ?> media-youtube-<?php print $id; ?>">
26
  <iframe class="media-youtube-player" <?php print $api_id_attribute; ?>width="<?php print $width; ?>" height="<?php print $height; ?>" title="<?php print $title; ?>" src="<?php print $url; ?>" frameborder="0" allowfullscreen><?php print $alternative_content; ?></iframe>
26
  <iframe class="media-youtube-player" <?php print $api_id_attribute; ?>width="<?php print $width; ?>" height="<?php print $height; ?>" title="<?php print $title; ?>" src="<?php print $url; ?>" name="<?php print $title; ?>" frameborder="0" allowfullscreen><?php print $alternative_content; ?></iframe>
27 27
</div>
drupal7/sites/all/modules/media_youtube/themes/media_youtube.theme.inc
35 35
  // Checked existing function.
36 36
  if(function_exists('file_uri_to_object')) {
37 37
    // Make the file object available.
38
    $file_object = file_uri_to_object($variables['uri']);
38
    $file_object = file_uri_to_object($variables['uri'], TRUE);
39 39
  }
40 40
  else {
41 41
    $file_object = media_youtube_file_uri_to_object($variables['uri']);
......
60 60
  }
61 61
  // These queries default to 0. If the option is true, set value to 1.
62 62
  foreach (array('autoplay', 'enablejsapi', 'loop', 'modestbranding') as $option) {
63
    if ($variables['options'][$option]) {
63
    if (isset($variables['options'][$option]) && $variables['options'][$option]) {
64 64
      $query[$option] = 1;
65 65
    }
66 66
  }

Formats disponibles : Unified diff