From 211fec35e3f069c266bc744fa983d66a1397bbb9 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 25 Nov 2019 15:56:29 +0700
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/versionHistory.js     | 1 +
 server/core/Reader/BookConverter/ConvertFb2.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js
index 158095e5..169c1fe1 100644
--- a/client/components/Reader/versionHistory.js
+++ b/client/components/Reader/versionHistory.js
@@ -6,6 +6,7 @@ export const versionHistory = [
 `
 <ul>
     <li>улучшение html-фильтров для сайтов</li>
+    <li>исправления багов</li>
 </ul>
 `
 },
diff --git a/server/core/Reader/BookConverter/ConvertFb2.js b/server/core/Reader/BookConverter/ConvertFb2.js
index ec492a0f..5c937996 100644
--- a/server/core/Reader/BookConverter/ConvertFb2.js
+++ b/server/core/Reader/BookConverter/ConvertFb2.js
@@ -23,7 +23,7 @@ class ConvertFb2 extends ConvertBase {
             const right = data.indexOf('?>', left);
             if (right >= 0) {
                 const head = data.slice(left, right + 2).toString();
-                const m = head.match(/encoding="(.*)"/);
+                const m = head.match(/encoding="(.*?)"/);
                 if (m) {
                     let encoding = m[1].toLowerCase();
                     if (encoding != 'utf-8') {