From 24fcc4181cb4deb4e85b7b636f24bc84a10a116b Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Mon, 19 Mar 2018 12:40:01 +0100
Subject: [PATCH] FIX #6404 fix break word and replace with spacing word
---
apps/maarch_entreprise/class/class_lists_Abstract.php | 2 +-
apps/maarch_entreprise/template/documents_list_search_adv.html | 2 +-
.../template/documents_list_with_attachments.html | 2 +-
modules/avis/template/documents_list_with_avis.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/maarch_entreprise/class/class_lists_Abstract.php b/apps/maarch_entreprise/class/class_lists_Abstract.php
index 10d75299966..5788f79e880 100755
--- a/apps/maarch_entreprise/class/class_lists_Abstract.php
+++ b/apps/maarch_entreprise/class/class_lists_Abstract.php
@@ -1072,7 +1072,7 @@ abstract class lists_Abstract extends Database
return "false";
} else {
if($resultTheLine[$i]['column']=='subject'){
- return str_replace(" ", " ", $resultTheLine[$i]['value']);
+ return preg_replace('/\s+/', ' ', $resultTheLine[$i]['value']);
} else {
return $resultTheLine[$i]['value'];
}
diff --git a/apps/maarch_entreprise/template/documents_list_search_adv.html b/apps/maarch_entreprise/template/documents_list_search_adv.html
index 94de5d22479..f51ce956f64 100755
--- a/apps/maarch_entreprise/template/documents_list_search_adv.html
+++ b/apps/maarch_entreprise/template/documents_list_search_adv.html
@@ -112,7 +112,7 @@ Mods
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
- <td style="font-size:14px;font-weight:bold;word-wrap: break-word;max-width: 1000px;">##loadValue|subject##</td>
+ <td style="font-size:14px;font-weight:bold;max-width: 1000px;">##loadValue|subject##</td>
<td width="17.5%" style="font-size:14px;font-weight:bold;color:#5C7C89;font-style: italic;">
##loadValue|alt_identifier##
</td>
diff --git a/apps/maarch_entreprise/template/documents_list_with_attachments.html b/apps/maarch_entreprise/template/documents_list_with_attachments.html
index f76f6ef11ad..48f2bf05677 100755
--- a/apps/maarch_entreprise/template/documents_list_with_attachments.html
+++ b/apps/maarch_entreprise/template/documents_list_with_attachments.html
@@ -113,7 +113,7 @@ Mods
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
- <td style="font-size:14px;font-weight:bold;word-wrap: break-word;max-width: 1000px;">##loadValue|subject##</td>
+ <td style="font-size:14px;font-weight:bold;max-width: 1000px;">##loadValue|subject##</td>
<td width="17.5%" style="font-size:14px;font-weight:bold;color:#5C7C89;font-style: italic;">
##loadValue|alt_identifier##
</td>
diff --git a/modules/avis/template/documents_list_with_avis.html b/modules/avis/template/documents_list_with_avis.html
index cb0076c72b8..61271fb1525 100755
--- a/modules/avis/template/documents_list_with_avis.html
+++ b/modules/avis/template/documents_list_with_avis.html
@@ -113,7 +113,7 @@ Mods
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
- <td style="font-size:14px;font-weight:bold;word-wrap: break-word;max-width: 1000px;">##loadValue|subject##</td>
+ <td style="font-size:14px;font-weight:bold;max-width: 1000px;">##loadValue|subject##</td>
<td width="17.5%" style="font-size:14px;font-weight:bold;color:#5C7C89;font-style: italic;">
##nbNoteAvis|'#loadValue|res_id#'## ##defineLang|_NB_AVIS_SENT##
</td>
--
GitLab