From c523f5a4e7d346a02528c9143767d0505664d0da Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 31 Jul 2020 16:33:45 +0200 Subject: Relaxed to allow underscore _ in URL hostnames (#3133) * Relaxed to allow underscore _ in URL hostnames #fix https://github.com/FreshRSS/FreshRSS/issues/3132 https://bugs.php.net/bug.php?id=64948 * Minor fix in favicons redirect * Minor fix in relative HREF for favicons --- app/Models/ConfigurationSetter.php | 2 +- app/Models/Feed.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/Models') diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index e6bcec54c..1d4b7f667 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -118,7 +118,7 @@ class FreshRSS_ConfigurationSetter { // Verify URL and add default value when needed if (isset($value['url'])) { - $is_url = filter_var($value['url'], FILTER_VALIDATE_URL); + $is_url = checkUrl($value['url']); if (!$is_url) { continue; } diff --git a/app/Models/Feed.php b/app/Models/Feed.php index a681345d4..7811d05b2 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -188,7 +188,7 @@ class FreshRSS_Feed extends Minz_Model { if ($validate) { $value = checkUrl($value); } - if (empty($value)) { + if ($value == '') { throw new FreshRSS_BadUrl_Exception($value); } $this->url = $value; @@ -204,7 +204,7 @@ class FreshRSS_Feed extends Minz_Model { if ($validate) { $value = checkUrl($value); } - if (empty($value)) { + if ($value == '') { $value = ''; } $this->website = $value; -- cgit v1.2.3