geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 09:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #352 from skipperbent/v3-development

Browse Source 
Fixed Input::all when php://input is not available
This commit is contained in:
Simon Sessingø
2018-01-14 15:54:37 +01:00
committed by GitHub
parent 9a7b598880 fc2e2e1e82
commit bbb81333b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Input/Input.php
+2 -2
View File
@@ -254,7 +254,7 @@ class Input
*/ */
public function all(array $filter = null) public function all(array $filter = null)
{ {
$output = $_GET; $output = $_GET + $_POST;
if ($this->request->getMethod() === 'post') { if ($this->request->getMethod() === 'post') {
@@ -263,7 +263,7 @@ class Input
if (strpos(trim($contents), '{') === 0) { if (strpos(trim($contents), '{') === 0) {
$post = json_decode($contents, true); $post = json_decode($contents, true);
if ($post !== false) { if ($post !== false) {
$output = array_merge($output, $post); $output += $post;
} }
} }
} }