Merge branch 'FreshRSS/dev' into PostgreSQL

This commit is contained in:
Alexandre Alapetite committed 2016-08-20 12:22:56 +02:00
commit 2af3abc89e
17 files changed
+218 -165

No files matched your search

+1 -6
View File
@@ -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;
}