? location-310828.patch
Index: location.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.tpl.php,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 location.tpl.php
--- location.tpl.php	28 Jul 2009 19:58:57 -0000	1.2.2.1
+++ location.tpl.php	31 Mar 2010 23:32:18 -0000
@@ -15,11 +15,17 @@
     if ($city) {
       $city_province_postal[] = '<span class="locality">'. $city .'</span>';
     }
-    if ($province) {
-      $city_province_postal[] = '<span class="region">'. $province .'</span>';
+
+    if (!empty($province) && !empty($postal_code)) {
+      $city_province_postal[] = '<span class="region">'. $province .'</span> <span class="postal-code">'. $postal_code .'</span>';
     }
-    if ($postal_code) {
-      $city_province_postal[] = '<span class="postal-code">'. $postal_code .'</span>';
+    else {
+      if ($province) {
+        $city_province_postal[] = '<span class="region">'. $province .'</span>';
+      }
+      if ($postal_code) {
+        $city_province_postal[] = '<span class="postal-code">'. $postal_code .'</span>';
+      }
     }
 
     echo implode(', ', $city_province_postal);