Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

2013-12-04 17:53:01 +01:00
parent 96fd3f3d32 d81426bab2
commit 72be705759
8 changed files with 180 additions and 94 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;