From ec052432c081cd0db4717cd3ee3c3f9f47785acc Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 6 Nov 2013 23:21:14 +0100 Subject: Contournement bug PHP 5.3.3- MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug #51192 FILTER_VALIDATE_URL will invalidate a hostname that includes '-' https://bugs.php.net/bug.php?id=51192 Corrige https://github.com/marienfressinaud/FreshRSS/issues/221 Au passage, désactive la validation des URLS provenant de la base de données et qui ont déjà été validées. --- app/models/RSSConfiguration.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/models/RSSConfiguration.php') diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php index 289538fd5..e79fd933b 100755 --- a/app/models/RSSConfiguration.php +++ b/app/models/RSSConfiguration.php @@ -248,9 +248,12 @@ class RSSConfiguration extends Model { $this->mark_when['scroll'] = $values['scroll']; } public function _urlShaarli ($value) { - $this->url_shaarli = ''; if (filter_var ($value, FILTER_VALIDATE_URL)) { $this->url_shaarli = $value; + } elseif (version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($value, '-') > 0) && ($value === filter_var($value, FILTER_SANITIZE_URL))) { //PHP bug #51192 + $this->url_shaarli = $value; + } else { + $this->url_shaarli = ''; } } public function _theme ($value) { -- cgit v1.2.3