mirror of
https://github.com/friendica/friendica
synced 2025-03-03 23:48:26 +00:00
Merge pull request #14820 from annando/exception
Fixes: Uncaught Exception TypeError: "array_merge(): Argument #1 must be of type array, int given"
This commit is contained in:
commit
02f693488f
1 changed files with 9 additions and 1 deletions
10
src/App.php
10
src/App.php
|
@ -573,7 +573,15 @@ class App
|
||||||
|
|
||||||
// Processes data from GET requests
|
// Processes data from GET requests
|
||||||
$httpinput = $httpInput->process();
|
$httpinput = $httpInput->process();
|
||||||
$input = array_merge($httpinput['variables'], $httpinput['files'], $request);
|
|
||||||
|
if (!is_array($httpinput['variables'])) {
|
||||||
|
$httpinput['variables'] = [];
|
||||||
|
}
|
||||||
|
if (!is_array($httpinput['files'])) {
|
||||||
|
$httpinput['files'] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$input = array_merge($httpinput['variables'], $httpinput['files'], $request);
|
||||||
|
|
||||||
// Let the module run its internal process (init, get, post, ...)
|
// Let the module run its internal process (init, get, post, ...)
|
||||||
$timestamp = microtime(true);
|
$timestamp = microtime(true);
|
||||||
|
|
Loading…
Add table
Reference in a new issue