diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-29 20:43:25 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-29 20:43:25 +0100 |
| commit | 059886bb0e56db6596cce7f37e0c4665722563bd (patch) | |
| tree | 9d032923784c6395be83350f87830850ed1af105 | |
| parent | 657b9792246417aa221bceebb7e2f938b72e209e (diff) | |
| parent | 0eef625b6d3e18d6545485d33f55865a4d6d1e3b (diff) | |
Merge branch 'HTTPS-enclosures' into dev
| -rw-r--r-- | lib/SimplePie/SimplePie/Item.php | 1 | ||||
| -rw-r--r-- | lib/SimplePie/SimplePie/Sanitize.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/SimplePie/SimplePie/Item.php b/lib/SimplePie/SimplePie/Item.php index 27e93456e..19ba7c8f4 100644 --- a/lib/SimplePie/SimplePie/Item.php +++ b/lib/SimplePie/SimplePie/Item.php @@ -2877,6 +2877,7 @@ class SimplePie_Item $width = null; $url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0])); + $url = $this->feed->sanitize->https_url($url); //FreshRSS if (isset($enclosure[0]['attribs']['']['type'])) { $type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php index 09294344e..021d38539 100644 --- a/lib/SimplePie/SimplePie/Sanitize.php +++ b/lib/SimplePie/SimplePie/Sanitize.php @@ -312,7 +312,7 @@ class SimplePie_Sanitize * Force HTTPS for selected Web sites * FreshRSS */ - protected function https_url($url) + public function https_url($url) { return (strtolower(substr($url, 0, 7)) === 'http://') && $this->is_https_domain(parse_url($url, PHP_URL_HOST)) ? |