summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-02-22 08:51:02 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-02-22 08:51:02 +0100
commit74ef8d9b1514600b4e18c0bd2f8fdbb6d9f3826c (patch)
tree3c609612bbacb47efbcb1d00c39ffd409bfeaf56 /lib
parent4a9a7404bcbcc15765ae5876dfb845a34917cba4 (diff)
SimplePie force HTTPS, another approach
https://github.com/FreshRSS/FreshRSS/issues/1083
Diffstat (limited to 'lib')
-rw-r--r--lib/SimplePie/SimplePie/Misc.php2
-rw-r--r--lib/SimplePie/SimplePie/Sanitize.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 98565608f..b13c70f4c 100644
--- a/lib/SimplePie/SimplePie/Misc.php
+++ b/lib/SimplePie/SimplePie/Misc.php
@@ -97,7 +97,7 @@ class SimplePie_Misc
{
return false;
}
- return SimplePie_Misc::https_url($iri->get_uri());
+ return $iri->get_uri();
}
/**
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index a6863ec03..fc916a259 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -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);
}