Merge branch 'HTTPS_Everywhere' of https://github.com/Alkarex/FreshRSS into HTTPS_Everywhere

This commit is contained in:
Alexandre Alapetite committed 2016-02-22 20:18:53 +01:00
commit 1f7647f4df
2 files changed
+3 -2

No files matched your search

+1 -1
View File
@@ -97,7 +97,7 @@ class SimplePie_Misc
{
return false;
}
return SimplePie_Misc::https_url($iri->get_uri());
return $iri->get_uri();
}
/**
+2 -1
View File
@@ -451,7 +451,8 @@ class SimplePie_Sanitize
if ($element->hasAttribute($attribute))
{
$value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
if ($value !== false)
$value = SimplePie_Misc::https_url($value); //FreshRSS
if ($value)
{
$element->setAttribute($attribute, $value);
}