aboutsummaryrefslogtreecommitdiff
path: root/app/Models/ConfigurationSetter.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-08-20 12:22:56 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-08-20 12:22:56 +0200
commit2af3abc89e56af75c38caf5e8071b3cd09bedba8 (patch)
treedc7e1cb7a31c039ec451d7788ae9d73bc336a6ee /app/Models/ConfigurationSetter.php
parente315192c4b3df89dddb1ac37c6c7a01531d7952f (diff)
parentf9359cd406bafdbb1ffaa8bad8a5810a02efc820 (diff)
Merge branch 'FreshRSS/dev' into PostgreSQL
Diffstat (limited to 'app/Models/ConfigurationSetter.php')
-rw-r--r--app/Models/ConfigurationSetter.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 988e83356..046f54955 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -129,12 +129,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) ||
- (version_compare(PHP_VERSION, '5.3.3', '<') &&
- (strpos($value, '-') > 0) &&
- ($value === filter_var($value, FILTER_SANITIZE_URL)))
- ); //PHP bug #51192
+ $is_url = filter_var($value['url'], FILTER_VALIDATE_URL);
if (!$is_url) {
continue;
}