aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-20 17:53:15 -0700
committerzotlabs <mike@macgirvin.com>2016-10-20 17:53:15 -0700
commit331412ddffc8d8a9aa0046840b22c67eb6403e1f (patch)
tree38f9b89e0ff1cce5e01bcffd46f816521ab2165f /include
parentedde78521959ee544f5e77b134e3e6dd4f75bf02 (diff)
downloadvolse-hubzilla-331412ddffc8d8a9aa0046840b22c67eb6403e1f.tar.gz
volse-hubzilla-331412ddffc8d8a9aa0046840b22c67eb6403e1f.tar.bz2
volse-hubzilla-331412ddffc8d8a9aa0046840b22c67eb6403e1f.zip
remove more corporate code - https url conversion for youtube is now handled by std_embeds plugin
Diffstat (limited to 'include')
-rwxr-xr-xinclude/oembed.php12
1 files changed, 1 insertions, 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,