From 8e0668edeeace82ef7f2feef1f3fef9ca920f0bf Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 9 Dec 2019 11:24:53 +0100
Subject: [PATCH] FEAT #11691 TIME 2 pb merge data without edit document
---
migration/19.12/migrateTemplates.php | 1 +
src/app/contentManagement/controllers/MergeController.php | 1 +
2 files changed, 2 insertions(+)
diff --git a/migration/19.12/migrateTemplates.php b/migration/19.12/migrateTemplates.php
index 143b527d526..d42542833a0 100644
--- a/migration/19.12/migrateTemplates.php
+++ b/migration/19.12/migrateTemplates.php
@@ -181,6 +181,7 @@ foreach ($customs as $custom) {
$tbs = new clsTinyButStrong();
$tbs->NoErr = true;
+ $tbs->Protect = false;
$tbs->PlugIn(TBS_INSTALL, OPENTBS_PLUGIN);
$tbs->LoadTemplate($pathToDocument, OPENTBS_ALREADY_UTF8);
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index ca845fc73a2..28fcf37aae8 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -44,6 +44,7 @@ class MergeController
$tbs = new \clsTinyButStrong();
$tbs->NoErr = true;
+ $tbs->Protect = false;
$tbs->PlugIn(TBS_INSTALL, OPENTBS_PLUGIN);
if (!empty($args['path'])) {
--
GitLab