From ee4a97aba1fccd212fb7c0468b66332e6f75defb Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 12 Feb 2020 12:19:48 +0100
Subject: [PATCH] FEAT #12345 TIME 2:00 Docx postal address
---
src/app/contentManagement/controllers/MergeController.php | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index 2edfe4da752..f4406c41780 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -68,13 +68,6 @@ class MergeController
$tbs->LoadTemplate($args['path'], OPENTBS_ALREADY_UTF8);
// $tbs->LoadTemplate("{$args['path']}#content.xml;styles.xml", OPENTBS_ALREADY_UTF8);
} elseif ($extension == 'docx') {
- foreach (['recipient', 'sender', 'attachmentRecipient'] as $contact) {
- if (!empty($dataToBeMerge[$contact]['postal_address'])) {
- $dataToBeMerge[$contact]['postal_address'] = nl2br($dataToBeMerge[$contact]['postal_address']);
- $dataToBeMerge[$contact]['postal_address'] = str_replace('<br />', '</w:t><w:br/><w:t>', $dataToBeMerge[$contact]['postal_address']);
- $dataToBeMerge[$contact]['postal_address'] = str_replace(["\n\r", "\r\n", "\r", "\n"], "", $dataToBeMerge[$contact]['postal_address']);
- }
- }
$tbs->LoadTemplate($args['path'], OPENTBS_ALREADY_UTF8);
$templates = ['word/header1.xml', 'word/header2.xml', 'word/header3.xml', 'word/footer1.xml', 'word/footer2.xml', 'word/footer3.xml'];
foreach ($templates as $template) {
--
GitLab