=== modified file 'uc_store/uc_country_select.js'
--- uc_store/uc_country_select.js	2007-12-04 16:17:13 +0000
+++ uc_store/uc_country_select.js	2008-01-07 21:44:55 +0000
@@ -17,12 +17,6 @@
 
   $.post(Drupal.settings['base_path'] + 'uc_js_util/zone_select', options,
          function (contents) {
-           if (contents.match('value="-1"') != null) {
-             $('#' + zone_select).attr('disabled', 'disabled');
-           }
-           else {
-             $('#' + zone_select).removeAttr('disabled');
-           }
            $('#' + zone_select).empty().append(contents).val(default_zone).change();
          }
   );

=== modified file 'uc_store/uc_store.module'
--- uc_store/uc_store.module	2008-01-04 15:46:26 +0000
+++ uc_store/uc_store.module	2008-01-07 21:43:16 +0000
@@ -395,7 +395,7 @@
       return t('Ubercart contacts Ubercart.org once a day to retrieve update reminders and security alerts that may prevent monetary losses from security vulnerabilites. Additional information may be sent to generate anonymous, community-wide statistical data for display on the site.');
   }
 }
- 
+
 /**
  * Implementation of hook_cron().
  */
@@ -430,7 +430,7 @@
           $vars['modules'][] = $return;
         }
       }
-        
+
       $vars['currency'] = variable_get('uc_currency_code', 'USD');
       $result = db_query("SELECT COUNT(DISTINCT o.order_id) AS orders, SUM(o.order_total) AS sales FROM {uc_orders} AS o WHERE o.order_status = 'completed' GROUP BY o.order_status");
       if ($stats = db_fetch_array($result)){
@@ -553,7 +553,7 @@
     $message = t('All Übercart modules are up to date.');
   }
   $statuses[] = array('status' => $status, 'title' => t('Module Versions'), 'desc' => $message);
-  
+
   return $statuses;
 } */
 
@@ -595,7 +595,7 @@
       default:
         $icon = base_path() . drupal_get_path('module', 'uc_store') .'/images/info.gif';
     }
-      
+
     $rows[] = array('data' => array(
       array('data' => '<img src="'. $icon .'" />'),
       array('data' => '<strong>'. $message['title'] .'</strong>', 'nowrap' => 'nowrap'),
@@ -1021,7 +1021,7 @@
         $country->country_iso_code_3,
         array('data' => abs($country->version), 'align' => 'center')
       );
-  
+
       $ops = array();
       if ($country->version < 0) {
         $ops[] = l(t('enable'), 'admin/store/settings/countries/'. $country->country_id .'/enable');
@@ -1034,7 +1034,7 @@
       }
       $ops[] = l(t('remove'), 'admin/store/settings/countries/'. $country->country_id .'/remove');
       $row[] = implode(' ', $ops);
-  
+
       $rows[] = $row;
       unset($files[$country->country_id]);
     }
@@ -1291,7 +1291,7 @@
     variable_set('uc_address_format_'. $country_id, $data['address_format']);
   }
   drupal_set_message(t('Country settings saved.'));
-}      
+}
 
 /**
  * Display the store settings overview page.
@@ -1437,7 +1437,7 @@
     ),
     '#default_value' => variable_get('uc_customer_list_address', 'billing'),
   );
-  
+
   $url = array('!url' => 'http://www.ubercart.org/');
   $messages = array(t('Display a different link on each page.'),
     t('E-commerce powered by Ubercart, the <a href="!url">free shopping cart software.</a>', $url),
@@ -1488,7 +1488,7 @@
     '#options' => drupal_map_assoc(array(0, 1, 2)),
     '#default_value' => variable_get('uc_currency_prec', 2),
   );
-  
+
   $form['weight'] = array(
     '#type' => 'fieldset',
     '#title' => t('Weight format'),
@@ -1885,7 +1885,7 @@
       $value = 0;
     }
   }
-  
+
   if ($value < 0) {
     $value = abs($value);
     $format = '-';
@@ -1909,11 +1909,11 @@
  */
 function uc_weight_format($value, $unit = NULL) {
   $vars = array('!value' => $value);
-  
+
   if (is_null($unit)){
     $unit = variable_get('uc_weight_unit', 'lb');
   }
-  
+
   $defaults = array(
     'lb' => '!value lb.',
     'oz' => '!value oz.',
@@ -1949,11 +1949,11 @@
  */
 function uc_length_format($value, $unit = NULL) {
   $vars = array('!value' => $value);
-  
+
   if (is_null($unit)){
     $unit = variable_get('uc_length_unit', 'in');
   }
-  
+
   $defaults = array(
     'in' => '!value in.',
     'cm' => '!valuecm',
@@ -2066,8 +2066,9 @@
  * Return the code abbreviation for a zone based on the zone ID or name.
  */
 function uc_get_zone_code($zone = NULL) {
-  if (is_null($zone))
+  if (is_null($zone) || $zone == -1) {
     return FALSE;
+  }
 
   if (is_numeric($zone)) {
     $result = db_query("SELECT zone_code FROM {uc_zones} WHERE zone_id = %d", $zone);
@@ -2230,7 +2231,6 @@
     '#options' => $options,
     '#default_value' => $default,
     '#required' => $required,
-    '#disabled' => isset($options[-1]) ? TRUE : FALSE,
   );
 
   return $select;
@@ -2252,7 +2252,7 @@
   }
 
   $result = db_query("SELECT * FROM {uc_countries} WHERE version > 0 ORDER BY %s", $order_by);
-  
+
   $options = array();
   while ($country = db_fetch_array($result)) {
     $options[$country['country_id']] = $country[$order_by];
@@ -2430,7 +2430,7 @@
               $pieces = explode('_', substr($file, 0, strlen($file) - 4));
               $country_id = intval($pieces[count($pieces) - 2]);
               $version = $pieces[count($pieces) - 1];
-              
+
               if (!isset($countries[$country_id])) {
                 $countries[$country_id]['version'] = $version;
                 $countries[$country_id]['file'] = $file;
@@ -2827,7 +2827,7 @@
       'ZMK' => t('Zambian Kwacha (ZMK)'),
       'ZWD' => t('Zimbabwe Dollar (ZWD)'),
     );
-  
+
     return $currency;
   }
 }
@@ -2845,4 +2845,3 @@
 
   return $email_from;
 }
-