From 5c10d3784456a97ebe537562326bf7b597fc5775 Mon Sep 17 00:00:00 2001
From: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date: Thu, 4 Jun 2015 11:49:41 +0200
Subject: [PATCH] Hotline#22882: Fix City and Zip code display
---
library/ZendAfi/View/Helper/RenderLieu.php | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/library/ZendAfi/View/Helper/RenderLieu.php b/library/ZendAfi/View/Helper/RenderLieu.php
index 50fee6b2d7b..b7b96dafe39 100644
--- a/library/ZendAfi/View/Helper/RenderLieu.php
+++ b/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();
--
GitLab