From 5b500ae42a97aa0b3eb144dd7d1247984c72e433 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@letrium.com>
Date: Wed, 27 May 2015 16:01:24 +0300
Subject: [PATCH] Added support UTF-8 strings for saved JSON data

---
 application/Espo/Core/Utils/File/Manager.php | 4 ++--
 application/Espo/Core/Utils/Layout.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/Espo/Core/Utils/File/Manager.php b/application/Espo/Core/Utils/File/Manager.php
index 0c92eefaae..4bb162e191 100644
--- a/application/Espo/Core/Utils/File/Manager.php
+++ b/application/Espo/Core/Utils/File/Manager.php
@@ -242,7 +242,7 @@ class Manager
     public function putContentsJson($path, $data)
     {
         if (!Utils\Json::isJSON($data)) {
-            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT);
+            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
         }
 
         return $this->putContents($path, $data, LOCK_EX);
@@ -283,7 +283,7 @@ class Manager
         $data = Utils\Util::merge($savedDataArray, $newDataArray);
 
         if ($isReturnJson) {
-            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT);
+            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
         }
 
         if ($isPhp) {
diff --git a/application/Espo/Core/Utils/Layout.php b/application/Espo/Core/Utils/Layout.php
index df9bc16440..b88ae1d571 100644
--- a/application/Espo/Core/Utils/Layout.php
+++ b/application/Espo/Core/Utils/Layout.php
@@ -136,7 +136,7 @@ class Layout
                     }
 
                     $layoutPath = $this->getLayoutPath($controllerName, true);
-                    $data = Json::encode($layoutData, \JSON_PRETTY_PRINT);
+                    $data = Json::encode($layoutData, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
 
                     $result &= $this->getFileManager()->putContents(array($layoutPath, $layoutName.'.json'), $data);
                 }