diff --git a/include/oembed.php b/include/oembed.php index 2ecb11e1f5..0d7e5ee84f 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -78,6 +78,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ if (!is_object($j)) return false; + // Always embed the SSL version + if (isset($j->html)) + $j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"), + array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html); + $j->embedurl = $embedurl; // If fetching information doesn't work, then improve via internal functions diff --git a/mod/oembed.php b/mod/oembed.php index 236625f68a..f79f66a483 100644 --- a/mod/oembed.php +++ b/mod/oembed.php @@ -9,17 +9,18 @@ function oembed_content(&$a){ echo oembed_replacecb($url); killme(); } - + if ($a->argv[1]=='h2b'){ $text = trim(hex2bin($_REQUEST['text'])); echo oembed_html2bbcode($text); killme(); } - + if ($a->argc == 2){ echo ""; $url = base64url_decode($a->argv[1]); $j = oembed_fetch_url($url); + echo $j->html; // logger('mod-oembed ' . $j->html, LOGGER_ALL); echo "";