Commit dd5a16aa by Alexander Makarov

Fixes #4127: `CaptchaValidator` clientside error message wasn't formed properly

parent efe5727f
...@@ -62,6 +62,7 @@ Yii Framework 2 Change Log ...@@ -62,6 +62,7 @@ Yii Framework 2 Change Log
- Bug #3989: Fixed yii\log\FileTarget::$rotateByCopy to avoid any rename (cebe) - Bug #3989: Fixed yii\log\FileTarget::$rotateByCopy to avoid any rename (cebe)
- Bug #3996: Traversing `Yii::$app->session` may cause a PHP error (qiangxue) - Bug #3996: Traversing `Yii::$app->session` may cause a PHP error (qiangxue)
- Bug #4020: OCI column detection did not work so gii and other things failed (Sanya1991) - Bug #4020: OCI column detection did not work so gii and other things failed (Sanya1991)
- Bug #4127: `CaptchaValidator` clientside error message wasn't formed properly (samdark)
- Bug: Fixed inconsistent return of `\yii\console\Application::runAction()` (samdark) - Bug: Fixed inconsistent return of `\yii\console\Application::runAction()` (samdark)
- Bug: URL encoding for the route parameter added to `\yii\web\UrlManager` (klimov-paul) - Bug: URL encoding for the route parameter added to `\yii\web\UrlManager` (klimov-paul)
- Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue) - Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue)
......
...@@ -92,9 +92,9 @@ class CaptchaValidator extends Validator ...@@ -92,9 +92,9 @@ class CaptchaValidator extends Validator
'hash' => $hash, 'hash' => $hash,
'hashKey' => 'yiiCaptcha/' . $this->captchaAction, 'hashKey' => 'yiiCaptcha/' . $this->captchaAction,
'caseSensitive' => $this->caseSensitive, 'caseSensitive' => $this->caseSensitive,
'message' => strtr($this->message, [ 'message' => Yii::$app->getI18n()->format($this->message, [
'attribute' => $object->getAttributeLabel($attribute), 'attribute' => $object->getAttributeLabel($attribute),
]), ], Yii::$app->language),
]; ];
if ($this->skipOnEmpty) { if ($this->skipOnEmpty) {
$options['skipOnEmpty'] = 1; $options['skipOnEmpty'] = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment