Projet

Général

Profil

Révision 639c8fcb

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/link/link.info
18 18
files[] = views/link_views_handler_argument_target.inc
19 19
files[] = views/link_views_handler_filter_protocol.inc
20 20

  
21
; Information added by Drupal.org packaging script on 2018-05-13
22
version = "7.x-1.5"
21
; Information added by Drupal.org packaging script on 2019-02-20
22
version = "7.x-1.6"
23 23
core = "7.x"
24 24
project = "link"
25
datestamp = "1526190487"
25
datestamp = "1550680687"
drupal7/sites/all/modules/link/link.module
315 315
    }
316 316
  }
317 317

  
318
  foreach ($items as $delta => $value) {
319
    if (isset($value['attributes']) && is_string($value['attributes'])) {
320
      $errors[$field['field_name']][$langcode][$delta][] = array(
321
        'error' => 'link_required',
322
        'message' => t('String values are not acceptable for attributes.'),
323
        'error_element' => array('url' => TRUE, 'title' => FALSE),
324
      );
325
    }
326
  }
327

  
318 328
  if ($instance['settings']['url'] === 'optional' && $instance['settings']['title'] === 'optional' && $instance['required'] && !$optional_field_found) {
319 329
    $errors[$field['field_name']][$langcode][0][] = array(
320 330
      'error' => 'link_required',
drupal7/sites/all/modules/media_youtube/includes/MediaInternetYouTubeHandler.inc
25 25
        return file_stream_wrapper_uri_normalize('youtube://l/' . $matches[1]);
26 26
      }
27 27
    }
28
    // http://youtube.com/watch/*
29
    // http://youtube.com/embed/*
30
    // http://youtube.com/v/*
31
    // http://youtube.com/?v=*
32
    // http://youtu.be/*
33
    // http://gdata.youtube.com/feeds/api/videos/*
28
    // https://youtube.com/watch/*
29
    // https://youtube.com/embed/*
30
    // https://youtube.com/v/*
31
    // https://youtube.com/?v=*
32
    // https://youtu.be/*
33
    // https://gdata.youtube.com/feeds/api/videos/*
34 34
    $patterns = array(
35 35
      '@youtube\.com/watch[#\?].*?v=([^"#\& ]+).*&list=([^"#\& ]+)@i',
36 36
      '@youtu\.be/([^"#\&\? ]+)\?list=([^"#\& ]+)@i',
......
88 88
  public function getOEmbed() {
89 89
    $uri = $this->parse($this->embedCode);
90 90
    $external_url = file_create_url($uri);
91
    $oembed_url = url('http://www.youtube.com/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
91
    $oembed_url = url('https://www.youtube.com/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
92 92
    $response = drupal_http_request($oembed_url);
93 93

  
94 94
    if (!isset($response->error)) {
......
110 110
  public function validId($id, $type = 'v') {
111 111
    $uri = file_stream_wrapper_uri_normalize('youtube://' . $type . '/' . check_plain($id));
112 112
    $external_url = file_create_url($uri);
113
    $oembed_url = url('http://www.youtube.com/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
113
    $oembed_url = url('https://www.youtube.com/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
114 114
    $response = drupal_http_request($oembed_url, array('method' => 'HEAD'));
115 115

  
116 116
    if ($response->code == 401) {
drupal7/sites/all/modules/media_youtube/includes/MediaYouTubeStreamWrapper.inc
27 27
    if (!isset($response->error)) {
28 28
      return $thumbnail_url;
29 29
    }
30
    elseif ($response->code == -110) {
31
      throw new MediaInternetValidationException("Connection timed out.");
32
    }
30 33
    elseif ($response->code == 401) {
31 34
      throw new MediaInternetValidationException("Embedding has been disabled for this video.");
32 35
    }
......
99 102
  }
100 103

  
101 104
  /**
102
   * Returns a url in the format "http://www.youtube.com/watch?v=qsPQN4MiTeE".
105
   * Returns a url in the format "https://www.youtube.com/watch?v=qsPQN4MiTeE".
103 106
   *
104 107
   * Overrides interpolateUrl() defined in MediaReadOnlyStreamWrapper.
105 108
   */
drupal7/sites/all/modules/media_youtube/includes/media_youtube.formatters.inc
184 184
  $element['protocol'] = array(
185 185
    '#title' => t('Iframe protocol'),
186 186
    '#type' => 'radios',
187
    '#default_value' => $settings['protocol'],
187
    '#default_value' => 'https:',
188 188
    '#options' => array(
189
      'http:' => 'http://',
190 189
      'https:' => 'https://',
191 190
    ),
192 191
    '#states' => array(
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 2018-02-17
15
version = "7.x-3.7"
14
; Information added by Drupal.org packaging script on 2019-02-14
15
version = "7.x-3.8"
16 16
core = "7.x"
17 17
project = "media_youtube"
18
datestamp = "1518862084"
19

  
18
datestamp = "1550118784"
drupal7/sites/all/modules/media_youtube/media_youtube.test
78 78
        'origin' => '',
79 79
        'protocol' => 'https:',
80 80
        'protocol_specify' => FALSE,
81
        'rel' => TRUE,
81
        'rel' => FALSE,
82
        'controls' => FALSE,
82 83
        'showinfo' => TRUE,
83 84
        'theme' => 'dark',
84 85
        'captions' => FALSE,
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 2018-02-17
12
version = "7.x-3.7"
11
; Information added by Drupal.org packaging script on 2019-02-14
12
version = "7.x-3.8"
13 13
core = "7.x"
14 14
project = "media_youtube"
15
datestamp = "1518862084"
16

  
15
datestamp = "1550118784"
drupal7/sites/all/modules/media_youtube/tests/media_youtube_test.module
32 32
    'thumbnail_width' => 480,
33 33
    'author_name' => 'YouTube Help',
34 34
    'height' => 270,
35
    'provider_url' => 'http://www.youtube.com/',
35
    'provider_url' => 'https://www.youtube.com/',
36 36
    'html' => '<iframe width="480" height="270" src="https://www.youtube.com/embed/' . $params['v'] . '?feature=oembed" frameborder="0" allowfullscreen></iframe>',
37 37
    'thumbnail_height' => 360,
38 38
    'title' => 'YouTube Content ID',
......
40 40
    'type' => 'video',
41 41
    'width' => 480,
42 42
    'version' => '1.0',
43
    'author_url' => 'http://www.youtube.com/user/YouTubeHelp',
43
    'author_url' => 'https://www.youtube.com/user/YouTubeHelp',
44 44
  );
45 45

  
46 46
  drupal_json_output($data);

Formats disponibles : Unified diff