php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 05:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3499 from ShNURoK42/master

Browse Source 
Rename errorHandler to getErrorHandler()
This commit is contained in:
Qiang Xue
2014-05-17 16:10:06 -04:00
parent aedac9628b a07b4afea6
commit ce12ddb6fd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/web/Controller.php
View File

@@ -105,7 +105,7 @@ class Controller extends \yii\base\Controller
public function 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.'));
}
return true;

2
framework/web/ErrorAction.php
View File

@@ -68,7 +68,7 @@ class ErrorAction extends Action
public function run()
{
if (($exception = Yii::$app->errorHandler->exception) === null) {
if (($exception = Yii::$app->getErrorHandler()->exception) === null) {
return '';
}