diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-21 22:22:43 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-21 22:22:43 +0100 |
| commit | 47bf8f09a3e1b1d9db80741232fcdcd1b0ce5da2 (patch) | |
| tree | 2927cd79af0fd97334a08b715db6644745c1b69f | |
| parent | bb3f9e67ed0213fa32205213a51549872a2f5e84 (diff) | |
| parent | 83e58d375962f7bc1f30e34e2895836ddc8e80d1 (diff) | |
Merge branch 'HTTPS_Everywhere' into dev
| -rw-r--r-- | lib/SimplePie/SimplePie/Misc.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php index 9e7ac4fa8..1abfb3368 100644 --- a/lib/SimplePie/SimplePie/Misc.php +++ b/lib/SimplePie/SimplePie/Misc.php @@ -77,6 +77,15 @@ class SimplePie_Misc return $time; } + /** + * Force HTTPS for selected Web sites + * FreshRSS + */ + public static https_url($url) + { + return preg_replace('%^http://((?:[^/]*?\.)?(?:youtube|dailymotion|tumblr)\.com/)%i', '//$1', $url); + } + public static function absolutize_url($relative, $base) { if (substr($relative, 0, 2) === '//') @@ -88,7 +97,7 @@ class SimplePie_Misc { return false; } - return $iri->get_uri(); + return https_url($iri->get_uri()); } /** |