dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1102 from glafarge/patch-1

Browse Source 
[-] FO : Fix newline trim
This commit is contained in:
Gregory Roussac committed 2013-12-04 08:52:02 -08:00
2 parents 8f34b61eec 39ded96964
commit d81426bab2
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
+1 -1
View File
@@ -379,7 +379,7 @@ class AddressFormatCore extends ObjectModel
$addressText .= (!empty($tmpText)) ? $tmpText.$newLine: ''; $addressText .= (!empty($tmpText)) ? $tmpText.$newLine: '';
} }
$addressText = rtrim($addressText, $newLine); $addressText = preg_replace('/'.preg_quote($newLine,'/').'$/i', '', $addressText);
$addressText = rtrim($addressText, $separator); $addressText = rtrim($addressText, $separator);
return $addressText; return $addressText;