Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Multi-db fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-05-15 16:58:07 +03:00
parent 76837ebe00
commit 1186603396
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Ninja/Repositories/AccountRepository.php
View File

@ -435,6 +435,11 @@ class AccountRepository
return trans('texts.oauth_taken'); return trans('texts.oauth_taken');
} }
// TODO remove once multi-db is enabled
if (User::whereOauthUserId($oauthUserId)->count() > 0) {
return trans('texts.oauth_taken');
}
if (! $user->registered) { if (! $user->registered) {
$rules = ['email' => 'email|required|unique:users,email,'.$user->id.',id']; $rules = ['email' => 'email|required|unique:users,email,'.$user->id.',id'];
$validator = Validator::make(['email' => $email], $rules); $validator = Validator::make(['email' => $email], $rules);