Merge pull request #245 from skipperbent/php5-5-compatibility

Fixed PHP 5.5 compatibility (issue: #244 - thanks @thexeos)
This commit is contained in:
Simon Sessingø
2017-07-18 11:27:59 +02:00
committed by GitHub
+1 -9
View File
@@ -283,15 +283,7 @@ class Input
}
}
$output = array_merge($_GET, $output);
if ($filter !== null) {
$output = array_filter($output, function ($key) use ($filter) {
return (in_array($key, $filter) === true);
}, ARRAY_FILTER_USE_KEY);
}
return $output;
return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : array_merge($_GET, $output);
}
}