diff options
Diffstat (limited to 'include/oembed.php')
| -rwxr-xr-x | include/oembed.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/oembed.php b/include/oembed.php index 1780e7046..eb7b76437 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -137,10 +137,6 @@ function oembed_fetch_url($embedurl){ if($action !== 'block') { $txt = Zlib\Cache::get('[' . App::$videowidth . '] ' . $embedurl); - - if(strstr($txt,'youtu') && strstr(z_root(),'https:')) { - $txt = str_replace('http:','https:',$txt); - } } if(is_null($txt)) { @@ -272,13 +268,7 @@ function oembed_format_object($j){ $th=120; $tw = $th*$tr; $tpl=get_markup_template('oembed_video.tpl'); - if(strstr($embedurl,'youtu') && strstr(z_root(),'https:')) { - $embedurl = str_replace('http:','https:',$embedurl); - $j['thumbnail_url'] = str_replace('http:','https:', $j['thumbnail_url']); - $jhtml = str_replace('http:','https:', $jhtml); - $j['html'] = str_replace('http:','https:', $j['html']); - - } + $ret.=replace_macros($tpl, array( '$baseurl' => z_root(), '$embedurl'=>$embedurl, @@ -348,7 +338,7 @@ function oembed_iframe($src,$width,$height) { // Make sure any children are sandboxed within their own iframe. - return '<iframe ' . $scroll . 'height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' + return '<iframe ' . $scroll . 'height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen frameborder="no" >' . t('Embedded content') . '</iframe>'; } |