mirror of
https://github.com/yiisoft/yii2.git
synced 2025-11-22 01:30:23 +08:00
Fix signature validation
This commit is contained in:
@@ -33,13 +33,16 @@ class LoginForm extends Model
|
|||||||
/**
|
/**
|
||||||
* Validates the password.
|
* Validates the password.
|
||||||
* This method serves as the inline validation for password.
|
* This method serves as the inline validation for password.
|
||||||
|
*
|
||||||
|
* @param string $attribute the attribute currently being validated
|
||||||
|
* @param array $params the additional name-value pairs given in the rule
|
||||||
*/
|
*/
|
||||||
public function validatePassword()
|
public function validatePassword($attribute, $params)
|
||||||
{
|
{
|
||||||
if (!$this->hasErrors()) {
|
if (!$this->hasErrors()) {
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
if (!$user || !$user->validatePassword($this->password)) {
|
if (!$user || !$user->validatePassword($this->password)) {
|
||||||
$this->addError('password', 'Incorrect username or password.');
|
$this->addError($attribute, 'Incorrect username or password.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,14 +34,17 @@ class LoginForm extends Model
|
|||||||
/**
|
/**
|
||||||
* Validates the password.
|
* Validates the password.
|
||||||
* This method serves as the inline validation for password.
|
* This method serves as the inline validation for password.
|
||||||
|
*
|
||||||
|
* @param string $attribute the attribute currently being validated
|
||||||
|
* @param array $params the additional name-value pairs given in the rule
|
||||||
*/
|
*/
|
||||||
public function validatePassword()
|
public function validatePassword($attribute, $params)
|
||||||
{
|
{
|
||||||
if (!$this->hasErrors()) {
|
if (!$this->hasErrors()) {
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
|
|
||||||
if (!$user || !$user->validatePassword($this->password)) {
|
if (!$user || !$user->validatePassword($this->password)) {
|
||||||
$this->addError('password', 'Incorrect username or password.');
|
$this->addError($attribute, 'Incorrect username or password.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user