Commit 2ee6d005 authored by Gus Childs's avatar Gus Childs
Browse files

Issue #2402589: Fixed HTTPS proxy issues by always embedding https YouTube paths.

parent 7d90b195

modules/youtube_colorbox/youtube_colorbox.module

+1 −1
Changes for modules/youtube_colorbox/youtube_colorbox.module: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ function youtube_colorbox_element_is_int($element, $form_state, $form) { 
 */

function youtube_colorbox_field_item_uri($item, $settings) {

  $uri = array(

    'path' => '//youtube.com/embed/' . $item['video_id'],

    'path' => 'https://youtube.com/embed/' . $item['video_id'],

    'options' => array(

      'attributes' => array(

        'class' => 'colorbox-load',

youtube.theme.inc

+1 −4
Changes for youtube.theme.inc: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ function theme_youtube_video($variables) { 
  $privacy = variable_get('youtube_privacy', FALSE);

  $dimensions = youtube_get_dimensions($size, $width, $height);



  // Protocol changes based on current page TODO.

  $protocol = (isset($_SERVER['HTTPS'])) ? 'https' : 'http';



  // Query string changes based on setings.

  $query = array();

  if (!$suggest) {
@@ -76,7 +73,7 @@ function theme_youtube_video($variables) { 
  // Domain changes based on settings.

  $domain = ($privacy) ? 'youtube-nocookie.com' : 'youtube.com';



  $path = $protocol . '://www.' . $domain . '/embed/' . $id;

  $path = 'https://www.' . $domain . '/embed/' . $id;

  $src = url($path, array('query' => $query));



  $output = '<iframe id="' . drupal_html_id($player_class) . '" class="' . $player_class . '"