Merge branch 'hotline#22882_location_information_in_article' into 'stable'

Hotline#22882 location information in article

See merge request !909

library/ZendAfi/View/Helper/RenderLieu.php

@@ -30,11 +30,8 @@ class ZendAfi_View_Helper_RenderLieu extends Zend_View_Helper_HtmlElement {
 		if (nl2br($lieu->getAdresse()))
 			$adresse[] = nl2br($lieu->getAdresse());
 
-		if ($lieu->getCodePostal())
-			$adresse[] = $lieu->getCodePostal();
-
-		if ($lieu->getVille())
-			$adresse[] = $lieu->getVille();
+		if ($lieu->getCodePostal() || $lieu->getVille())
+			$adresse[] = $lieu->getCodePostal() . ' ' . $lieu->getVille();
 
 		if ($lieu->getTelephone())
 			$adresse[] = $lieu->getTelephone();