nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10339 from annando/warning

Browse source 
Avoid warning "array_merge(): Expected parameter 2 to be an array, null given"
This commit is contained in:
Philipp 2021-05-30 07:45:52 +02:00 committed by GitHub
parent 891fb42a23 c05c447d0f
commit 2258544237
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Mastodon/Apps.php
View file

@ -50,7 +50,7 @@ class Apps extends BaseApi
if (!empty($postdata)) { if (!empty($postdata)) {
$postrequest = json_decode($postdata, true); $postrequest = json_decode($postdata, true);
if (!empty($postrequest) && is_array($postrequest)) { if (!empty($postrequest) && is_array($postrequest)) {
$request = array_merge($request, $$postrequest); $request = array_merge($request, $postrequest);
} }
} }