diff --git a/framework/yii/base/ErrorHandler.php b/framework/yii/base/ErrorHandler.php
index 7db5161..8997b9e 100644
--- a/framework/yii/base/ErrorHandler.php
+++ b/framework/yii/base/ErrorHandler.php
@@ -152,11 +152,12 @@ class ErrorHandler extends Component
/**
* Creates HTML containing link to the page with the information on given HTTP status code.
* @param integer $statusCode to be used to generate information link.
+ * @param string $statusDescription Description to display after the the status code.
* @return string generated HTML with HTTP status code information.
*/
- public function createHttpStatusLink($statusCode)
+ public function createHttpStatusLink($statusCode, $statusDescription)
{
- return '' . (int)$statusCode . '';
+ return 'HTTP ' . (int)$statusCode . ' – ' . $statusDescription . '';
}
/**
diff --git a/framework/yii/views/errorHandler/main.php b/framework/yii/views/errorHandler/main.php
index f63f246..93fa589 100644
--- a/framework/yii/views/errorHandler/main.php
+++ b/framework/yii/views/errorHandler/main.php
@@ -13,11 +13,15 @@ $context = $this->context;
-
- <?php echo $context->htmlEncode($exception->getName() . ' – ' . get_class($exception)); ?>
-
- <?php echo $context->htmlEncode(get_class($exception)); ?>
-
+ <?php
+ if ($exception instanceof \yii\base\HttpException) {
+ echo (int) $exception->statusCode . ' ' . $context->htmlEncode($exception->getName());
+ } elseif ($exception instanceof \yii\base\Exception) {
+ echo $context->htmlEncode($exception->getName() . ' – ' . get_class($exception));
+ } else {
+ echo $context->htmlEncode(get_class($exception));
+ }
+ ?>