diff options
| -rw-r--r-- | force-https.default.txt | 4 | ||||
| -rw-r--r-- | lib/lib_rss.php | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/force-https.default.txt b/force-https.default.txt index 48c0461b2..0edbc7f08 100644 --- a/force-https.default.txt +++ b/force-https.default.txt @@ -1,3 +1,7 @@ +# Do not modify this file, which defines default values, +# but specify your own values in ./data/force-https.txt +# Examples of values, one per line: com, example.org, www.example.net + blogger.com creativecommons.org dailymotion.com diff --git a/lib/lib_rss.php b/lib/lib_rss.php index f0a070820..99c72cb49 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -390,6 +390,11 @@ function customSimplePie(array $attributes = [], array $curl_options = []): \Sim if (is_array($force)) { $https_domains = array_merge($https_domains, $force); } + + // Remove whitespace and comments starting with # / ; + $https_domains = preg_replace('%\\s+|[\/#;].*$%', '', $https_domains) ?? $https_domains; + $https_domains = array_filter($https_domains, fn(string $v) => $v !== ''); + $simplePie->set_https_domains($https_domains); return $simplePie; } |