summaryrefslogtreecommitdiff
path: root/lib/SimplePie
diff options
context:
space:
mode:
Diffstat (limited to 'lib/SimplePie')
-rw-r--r--lib/SimplePie/SimplePie/Misc.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 4c9f8cff6..b9d74f894 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -83,7 +83,13 @@ class SimplePie_Misc
*/
public static function https_url($url)
{
- return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', 'https://$1', $url);
+ if (strtolower(substr($url, 0, 7)) === 'http://')
+ {
+ $domain = parse_url($url, PHP_URL_HOST);
+ return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', 'https://$1', $url);
+ return substr_replace($url, 's', 4, 0); //Add the 's' to HTTPS
+ }
+ return $url;
}
public static function absolutize_url($relative, $base)