Move HTTPS exception for YouTube and Vimeo to OEmbed::fetchUrl

- Both Youtube and Vimeo output OEmbed endpoint URL with HTTP but their OEmbed endpoint is only accessible by HTTPS ¯\_(ツ)_/¯

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 3afa36904a931e7b3642f82efae36ef25b25ecba..1a5d1d9042ac80cd6d4e30580ba0fa7dd8e915e5 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -106,6 +106,10 @@ class OEmbed
                                                        as $link)
                                                {
                                                        $href = $link->getAttributeNode('href')->nodeValue;
+                                                       // Both Youtube and Vimeo output OEmbed endpoint URL with HTTP
+                                                       // but their OEmbed endpoint is only accessible by HTTPS ¯\_(ツ)_/¯
+                                                       $href = str_replace(['http://www.youtube.com/', 'http://player.vimeo.com/'],
+                                                               ['https://www.youtube.com/', 'https://player.vimeo.com/'], $href);
                                                        $result = DI::httpRequest()->fetchFull($href . '&maxwidth=' . $a->videowidth);
                                                        if ($result->getReturnCode() === 200) {
                                                                $json_string = $result->getBody();
@@ -335,10 +339,6 @@ class OEmbed
 
        public static function getHTML($url, $title = null)
        {
-               // Always embed the SSL version
-               $url = str_replace(["http://www.youtube.com/", "http://player.vimeo.com/"],
-                                       ["https://www.youtube.com/", "https://player.vimeo.com/"], $url);
-
                $o = self::fetchURL($url, !self::isAllowedURL($url));
 
                if (!is_object($o) || property_exists($o, 'type') && $o->type == 'error') {