Remove direct calls to App->user
This commit is contained in:
parent
266ee26240
commit
fc283ab928
51 changed files with 238 additions and 166 deletions
|
|
@ -353,10 +353,12 @@ class Authentication
|
|||
}
|
||||
}
|
||||
|
||||
$a->setUserId($user_record['uid']);
|
||||
$a->setNickname($user_record['nickname']);
|
||||
$a->user = $user_record;
|
||||
|
||||
if ($login_initial) {
|
||||
Hook::callAll('logged_in', $a->user);
|
||||
Hook::callAll('logged_in', $user_record);
|
||||
|
||||
if (DI::module()->getName() !== 'home' && $this->session->exists('return_path')) {
|
||||
$this->baseUrl->redirect($this->session->get('return_path'));
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ class BasicAuth
|
|||
|
||||
Session::set('allow_api', true);
|
||||
|
||||
Hook::callAll('logged_in', $a->user);
|
||||
Hook::callAll('logged_in', $record);
|
||||
|
||||
if (Session::get('allow_api')) {
|
||||
self::$current_user_id = local_user();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue