@@ -, +, @@
comma
---
.../prog/en/includes/member-display-address-style.inc | 2 +-
.../prog/en/includes/member-display-alt-address-style.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
@@ -26,7 +26,7 @@
[%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
[%~ patron.city |html ~%][%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%][% patron.state |html ~%][%~ END ~%]
- [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state ) ~%], [% END ~%][% patron.country |html ~%][%~ END ~%]
+ [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%], [% END ~%][% patron.country |html ~%][%~ END ~%]
[%~ END ~%]
[%~ END ~%]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc
@@ -23,7 +23,7 @@
[% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
[% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%]
- [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state ) %], [% END %][% patron.B_country | html %][% END %]
+ [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state || patron.B_city ) %], [% END %][% patron.B_country | html %][% END %]
[% END %]
[% END %]
--