diff --git a/app/Models/Pages/Auth.php b/app/Models/Pages/Auth.php index 210e0d5c..1c440d7d 100644 --- a/app/Models/Pages/Auth.php +++ b/app/Models/Pages/Auth.php @@ -47,7 +47,7 @@ class Auth extends Page /** * Вход на форум */ - public function login(array $args, string $method): Page + public function login(array $args, string $method, string $username = ''): Page { $this->c->Lang->load('validator'); $this->c->Lang->load('auth'); @@ -98,7 +98,7 @@ class Auth extends Page $this->titles = __('Login'); $this->regLink = '1' == $this->c->config->o_regs_allow ? $this->c->Router->link('Register') : null; - $username = $v ? $v->username : ($args['_username'] ?? ''); + $username = $v ? $v->username : $username; $save = $v ? $v->save : 1; $redirect = $v ? $v->redirect : $this->c->Router->validate($ref, 'Index'); $this->form = $this->formLogin($username, $save, $redirect); diff --git a/app/Models/Pages/Register.php b/app/Models/Pages/Register.php index fe22a273..1b529799 100644 --- a/app/Models/Pages/Register.php +++ b/app/Models/Pages/Register.php @@ -272,7 +272,7 @@ class Register extends Page $auth = $this->c->Auth; $auth->fIswev = ['s', __('Reg complete')]; - return $auth->login(['_username' => $v->username], 'GET'); + return $auth->login([], 'GET', $v->username); } } @@ -309,6 +309,6 @@ class Register extends Page $auth = $this->c->Auth; $auth->fIswev = ['s', __('Reg complete')]; - return $auth->login(['_username' => $user->username], 'GET'); + return $auth->login([], 'GET', $user->username); } }