Merge pull request #1102 from glafarge/patch-1

[-] FO : Fix newline trim
2013-12-04 08:52:02 -08:00
parent 8f34b61eec 39ded96964
commit d81426bab2
1 changed files with 1 additions and 1 deletions
@@ -379,7 +379,7 @@ class AddressFormatCore extends ObjectModel
 					$addressText .= (!empty($tmpText)) ? $tmpText.$newLine: '';
 				}

-		$addressText = rtrim($addressText, $newLine);
+		$addressText = preg_replace('/'.preg_quote($newLine,'/').'$/i', '', $addressText);
 		$addressText = rtrim($addressText, $separator);

 		return $addressText;