Index: location.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.tpl.php,v
retrieving revision 1.2.2.4
diff -u -p -r1.2.2.4 location.tpl.php
--- location.tpl.php	27 May 2010 14:48:13 -0000	1.2.2.4
+++ location.tpl.php	28 Aug 2010 21:29:02 -0000
@@ -1,55 +1,52 @@
 <div class="location vcard"><div class="adr">
-<span class="fn"><?php echo $name; ?></span>
-<?php if ($street) {?>
-<div class="street-address"><?php
-  echo $street;
-  if ($additional) {
-    echo ' '. $additional;
-  }
-?></div>
-<?php }?>
-<?php
-  if ($city) {
-    echo '<span class="locality">' . $city . '</span>';
-    if ($province) {
-      echo ', ';
-    }
-  }
-  if ($province) {
-    echo '<span class="region">' . $province_print . '</span> ';
-  }
-  if ($postal_code) {
-    echo ' <span class="postal-code">' . $postal_code . '</span>';
-  }
-?>
-<?php if ($country_name) { ?>
-<div class="country-name"><?php echo $country_name; ?></div>
-<?php } ?>
-<?php if (isset($phone) && $phone): ?>
-<div class="tel">
-  <abbr class="type" title="voice"><?php print t("Phone")?>:</abbr>
-  <span class="value"><?php print $phone; ?></span>
-</div>
-<?php endif; ?>
-<?php if (isset($fax) && $fax): ?>
-<div class="tel">
-  <abbr class="type" title="fax"><?php print t("Fax");?>:</abbr>
-  <span><?php print $fax; ?></span>
-</div>
-<?php endif; ?>
-<?php
-  // "Geo" microformat, see http://microformats.org/wiki/geo
-  if ($latitude && $longitude) {
-    // Assume that 0, 0 is invalid.
-    if ($latitude != 0 || $longitude != 0) {
-?>
-<span class="geo"><abbr class="latitude" title="<?php echo $latitude; ?>"><?php echo $latitude_dms; ?></abbr>, <abbr class="longitude" title="<?php echo $longitude; ?>"><?php echo $longitude_dms; ?></abbr></span>
-<?php
-    }
-  }
-?>
-</div>
-<div class="map-link">
-  <?php echo $map_link; ?>
-</div>
+  <?php if (!empty($name)): ?>
+    <span class="fn"><?php echo $name; ?></span>
+  <?php endif; ?>
+  <?php if (!empty($street)): ?>
+    <div class="street-address">
+      <?php print $street; ?>
+      <?php if (!empty($additional)): ?><?php print $additional; ?><?php endif; ?>
+    </div>
+  <?php endif; ?>
+  <?php if (!empty($city)): ?>
+    <span class="locality"><?php print $city; ?></span><?php if ($province): ?>,<?php endif; ?>
+    <?php if (!empty($province)): ?>
+      <span class="region"><?php print $province_print; ?></span>
+    <?php endif; ?>
+    <?php if (!empty($postal_code)): ?>
+      <span class="postal-code"><?php print $postal_code; ?></span>
+    <?php endif; ?>
+  <?php endif; ?>
+  <?php if (!empty($country_name)): ?>
+    <div class="country-name"><?php echo $country_name; ?></div>
+  <?php endif; ?>
+  <?php if (!empty($phone)): ?>
+    <div class="tel">
+      <abbr class="type" title="voice"><?php print t("Phone")?>:</abbr>
+      <span class="value"><?php print $phone; ?></span>
+    </div>
+  <?php endif; ?>
+  <?php if (!empty($fax)): ?>
+    <div class="tel">
+      <abbr class="type" title="fax"><?php print t("Fax");?>:</abbr>
+      <span><?php print $fax; ?></span>
+    </div>
+  <?php endif; ?>
+  <?php
+    // "Geo" microformat, see http://microformats.org/wiki/geo
+    if (isset($latitude) && isset($longitude)):
+      // Assume that 0, 0 is invalid.
+      if ($latitude != 0 || $longitude != 0):
+  ?>
+  <span class="geo"><abbr class="latitude" title="<?php echo $latitude; ?>"><?php echo $latitude_dms; ?></abbr>, <abbr class="longitude" title="<?php echo $longitude; ?>"><?php echo $longitude_dms; ?></abbr></span>
+  <?php
+      endif;
+    endif;
+  ?>
+  </div>
+  <?php if (!empty($map_link)): ?>
+    <div class="map-link">
+      <?php echo $map_link; ?>
+    </div>
+  <?php endif; ?>
 </div>
Index: locations.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/locations.tpl.php,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 locations.tpl.php
--- locations.tpl.php	19 Apr 2010 22:52:00 -0000	1.2.2.2
+++ locations.tpl.php	28 Aug 2010 21:29:02 -0000
@@ -1,9 +1,8 @@
-<?php if (count($locations)) {?>
-<h3 class="location-locations-header"><?php echo count($locations) > 1 ? t('Locations') : t('Location');?></h3>
-<div class="location-locations-wrapper">
-<?php
-  foreach ($locations as $location) {
-    echo $location;
-  }
-  echo '</div>';
-} ?>
+<?php if (!empty($locations)): ?>
+  <h3 class="location-locations-header"><?php print ($locations > 1) ? t('Locations') : t('Location'); ?></h3>
+  <div class="location-locations-wrapper">
+    <?php foreach ($locations as $location): ?>
+      <?php print $location; ?>
+    <?php endforeach; ?>
+  </div>
+<?php endif; ?>