Merge branch 'v4-development' into v4-optional-character-fix

This commit is contained in:
Simon Sessingø
2018-08-24 17:23:33 +02:00
committed by GitHub
3 changed files with 8 additions and 10 deletions
+6 -10
View File
@@ -298,17 +298,13 @@ class InputHandler
// Append POST data
$output += $_POST;
$contents = file_get_contents('php://input');
if (\in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
$contents = file_get_contents('php://input');
// Append any PHP-input json
if (strpos(trim($contents), '{') === 0) {
$post = json_decode($contents, true);
if ($post !== false) {
$output += $post;
}
// Append any PHP-input json
if (strpos(trim($contents), '{') === 0) {
$post = json_decode($contents, true);
if ($post !== false) {
$output += $post;
}
}
}