mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-04 22:53:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'HTTPS_Everywhere' into dev

Browse Source
This commit is contained in:
Alexandre Alapetite
2016-02-21 22:22:43 +01:00
parent bb3f9e67ed 83e58d3759
commit 47bf8f09a3
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SimplePie/SimplePie/Misc.php
View File

@@ -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());
}
/**