--- location.module.orig	2008-12-05 12:22:18.000000000 -0500
+++ location.module	2008-12-05 12:27:07.000000000 -0500
@@ -1000,8 +1000,9 @@ function location_nodeapi(&$node, $op, $
     case 'view':
       if (variable_get('location_display_location', 1)) {
         $display = variable_get('location_display_'. $node->type, array('teaser' => TRUE, 'full' => TRUE, 'weight' => 0, 'hide' => array()));
+        $maxnum = variable_get('location_maxnum_'. $node->type, 0);
 
-        if (($a3 && $display['teaser']) || (!$a3 && $display['full'])) {
+        if (($a3 && $display['teaser'] && $maxnum > 0) || (!$a3 && $display['full'] && $maxnum > 0)) {
           $hide = array_keys(array_filter($display['hide']));
           // Show all locations
           if ($output = theme('locations', $node->locations, $hide)) {