From ac7b0ef6ffb2ac0ab2f8abd2abae75a02f552a03 Mon Sep 17 00:00:00 2001
From: SilverFire - Dima Naumenko <d.naumenko.a@gmail.com>
Date: Tue, 17 Nov 2015 14:18:26 +0200
Subject: [PATCH] ErrorHandler - hardcoded UTF-8 in mb_* functions

As `Yii::$app` may be not initialized on the moment of error,
decided to hardcode UTF-8.

PR  #10169
---
 framework/web/ErrorHandler.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php
index ed4929ffa4..53d0b1f1ce 100644
--- a/framework/web/ErrorHandler.php
+++ b/framework/web/ErrorHandler.php
@@ -162,7 +162,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
      */
     public function htmlEncode($text)
     {
-        return htmlspecialchars($text, ENT_QUOTES, Yii::$app->charset);
+        return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
     }
 
     /**
@@ -391,8 +391,8 @@ class ErrorHandler extends \yii\base\ErrorHandler
                 $args[$key] = '<span class="keyword">' . ($value ? 'true' : 'false') . '</span>';
             } elseif (is_string($value)) {
                 $fullValue = $this->htmlEncode($value);
-                if (mb_strlen($value, Yii::$app->charset) > 32) {
-                    $displayValue = $this->htmlEncode(mb_substr($value, 0, 32, Yii::$app->charset)) . '...';
+                if (mb_strlen($value, 'UTF-8') > 32) {
+                    $displayValue = $this->htmlEncode(mb_substr($value, 0, 32, 'UTF-8')) . '...';
                     $args[$key] = "<span class=\"string\" title=\"$fullValue\">'$displayValue'</span>";
                 } else {
                     $args[$key] = "<span class=\"string\">'$fullValue'</span>";