]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3d26e1d)
Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active
authorMichael Vogel <icarus@dabo.de>
Sun, 14 Dec 2014 11:47:16 +0000 (12:47 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 14 Dec 2014 11:47:16 +0000 (12:47 +0100)
include/oembed.php patch | blob | history
mod/oembed.php patch | blob | history

diff --git a/include/oembed.php b/include/oembed.php
index 2ecb11e1f5f684d45b8f2f739476ad6c0254af97..0d7e5ee84f165f8ae74cfc62eb14f94978a1d4eb 100755 (executable)
--- 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 236625f68a662ac23b1631b659bfb7e15f875f1e..f79f66a483863f0db1b5c7567c3ea54aed4b9bb5 100644 (file)
--- 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 "<html><body>";
                $url = base64url_decode($a->argv[1]);
                $j = oembed_fetch_url($url);
+
                echo $j->html;
 //             logger('mod-oembed ' . $j->html, LOGGER_ALL);
                echo "</body></html>";
Unnamed repository; edit this file 'description' to name the repository.