Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #5915 from turbo124/v5-develop

Browse Source 
Fix for regression in Handler.php
This commit is contained in:
David Bomba 2021-06-04 08:30:36 +10:00 committed by GitHub
commit 474e942cfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Utils/Traits/SubscriptionHooker.php
View File

@ -40,12 +40,12 @@ trait SubscriptionHooker
RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false
]);
return json_decode($response->getBody(),true);
return array_merge($body, json_decode($response->getBody(),true));
}
catch(\Exception $e)
{
return ['message' => $e->getMessage(), 'status_code' => 500];
return array_merge($body, ['message' => $e->getMessage(), 'status_code' => 500]);
}