merge from yiisoft/yii2

This commit is contained in:
cuileon
2018-11-14 11:57:32 +08:00
parent 47df8a8cc0
commit 489dd119a5
426 changed files with 18465 additions and 4215 deletions

View File

@@ -263,7 +263,10 @@ class ErrorHandler extends \yii\base\ErrorHandler
return ob_get_clean();
}
return Yii::$app->getView()->renderFile($_file_, $_params_, $this);
$view = Yii::$app->getView();
$view->clear();
return $view->renderFile($_file_, $_params_, $this);
}
/**