From 331412ddffc8d8a9aa0046840b22c67eb6403e1f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 20 Oct 2016 17:53:15 -0700 Subject: remove more corporate code - https url conversion for youtube is now handled by std_embeds plugin --- include/oembed.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/include/oembed.php b/include/oembed.php index 1780e7046..52fb04058 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, -- cgit v1.2.3