diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-06 23:21:14 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-06 23:21:14 +0100 |
| commit | ec052432c081cd0db4717cd3ee3c3f9f47785acc (patch) | |
| tree | 553061f304dbd006e94aa961559830c6a87985f0 /app/models/RSSConfiguration.php | |
| parent | fe78c7fff3606cc51baae5262ce782381b422b52 (diff) | |
Contournement bug PHP 5.3.3-
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.
Diffstat (limited to 'app/models/RSSConfiguration.php')
| -rwxr-xr-x | app/models/RSSConfiguration.php | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |