diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php index 2edfe4da752747a66d515c900110863a8597ec20..f4406c417809cbec9bf430c44ae719b7dd8e97cd 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) {