diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-28 21:45:40 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-28 21:45:40 +0100 |
| commit | 98a27132c07d515d63e4a2da999cde2eeb2ebeac (patch) | |
| tree | 171d066a965147d925fc8088770a9fe107fb6701 /lib/lib_rss.php | |
| parent | d6f43b76350239befd22748418db98e38a4927cc (diff) | |
| parent | 9711f02db75006d622d75142d46c3c8d714c957f (diff) | |
Merge branch 'HTTPS_Everywhere' into dev
Diffstat (limited to 'lib/lib_rss.php')
| -rw-r--r-- | lib/lib_rss.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index a09960de0..135115ea5 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -238,6 +238,16 @@ function customSimplePie() { 'src', ), )); + $https_domains = array(); + $force = @file(DATA_PATH . '/force-https.default.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); + if (is_array($force)) { + $https_domains = array_merge($https_domains, $force); + } + $force = @file(DATA_PATH . '/force-https.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); + if (is_array($force)) { + $https_domains = array_merge($https_domains, $force); + } + $simplePie->set_https_domains($https_domains); return $simplePie; } |