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

pull/1087/head
Alexandre Alapetite 9 years ago
commit 1f7647f4df
  1. 2
      lib/SimplePie/SimplePie/Misc.php
  2. 3
      lib/SimplePie/SimplePie/Sanitize.php

@ -97,7 +97,7 @@ class SimplePie_Misc
{ {
return false; return false;
} }
return SimplePie_Misc::https_url($iri->get_uri()); return $iri->get_uri();
} }
/** /**

@ -451,7 +451,8 @@ class SimplePie_Sanitize
if ($element->hasAttribute($attribute)) if ($element->hasAttribute($attribute))
{ {
$value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base)); $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); $element->setAttribute($attribute, $value);
} }

Loading…
Cancel
Save