Skip to content

Y
yii2
Commit ce12ddb6 by Qiang Xue
Options

Merge pull request #3499 from ShNURoK42/master

Rename errorHandler to getErrorHandler()
parents aedac962 a07b4afe
Showing with 2 additions and 2 deletions
framework/web/Controller.php
...@@ -105,7 +105,7 @@ class Controller extends \yii\base\Controller ...@@ -105,7 +105,7 @@ class Controller extends \yii\base\Controller
public function beforeAction($action) public function beforeAction($action)
{ {
if (parent::beforeAction($action)) { if (parent::beforeAction($action)) {
if ($this->enableCsrfValidation && Yii::$app->errorHandler->exception === null && !Yii::$app->getRequest()->validateCsrfToken()) { if ($this->enableCsrfValidation && Yii::$app->getErrorHandler()->exception === null && !Yii::$app->getRequest()->validateCsrfToken()) {
throw new BadRequestHttpException(Yii::t('yii', 'Unable to verify your data submission.')); throw new BadRequestHttpException(Yii::t('yii', 'Unable to verify your data submission.'));
} }
return true; return true;
......
framework/web/ErrorAction.php
...@@ -68,7 +68,7 @@ class ErrorAction extends Action ...@@ -68,7 +68,7 @@ class ErrorAction extends Action
public function run() public function run()
{ {
if (($exception = Yii::$app->errorHandler->exception) === null) { if (($exception = Yii::$app->getErrorHandler()->exception) === null) {
return ''; return '';
} }
......
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