1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

fixed bug with contact and authed user clash (#3685)

If a contact key is set and a user is also logged in. this was causing the account id to be set to that of the contact, not the authed user. broke multi-account setups.
This commit is contained in:
erichester76 2020-05-18 19:53:07 -04:00 committed by GitHub
parent a8c8392f8d
commit cd2cbadd40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,8 +49,10 @@ class EntityRequest extends Request
//Support Client Portal Scopes
$accountId = false;
if(Input::get('account_id'))
if($this->user()->account_id)
$accountId = $this->user()->account_id;
elseif(Input::get('account_id'))
$accountId = Input::get('account_id');
elseif($contact = Contact::getContactIfLoggedIn())
$accountId = $contact->account->id;