Merge branch 'release/0.7.8b'

Исправлен баг
Merge tag '0.7.8' into develop
2019-11-25 16:00:00 +07:00 · 2019-11-25 15:56:29 +07:00 · 2019-11-25 15:39:35 +07:00
2 changed files with 2 additions and 1 deletions
--- 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>
 `
 },
--- 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') {
Author	SHA1	Message	Date
Book Pauk	4bbfdc2cb2	Merge branch 'release/0.7.8b'	2019-11-25 16:00:00 +07:00
Book Pauk	211fec35e3	Исправлен баг	2019-11-25 15:56:29 +07:00
Book Pauk	b8214a46ae	Merge tag '0.7.8' into develop 0.7.8	2019-11-25 15:39:35 +07:00