--- location.token.inc.orig	2008-10-19 23:38:28.000000000 +0200
+++ location.token.inc	2008-10-19 23:40:38.000000000 +0200
@@ -15,7 +15,15 @@ function _location_token_values($type, $
     if (!empty($object->locations)) {
       foreach ($object->locations as $key => $location) {
         foreach ($location as $field => $value) {
-          $values["location-{$field}_{$key}"] = check_plain($value);
+          if (is_array($value)) {
+            foreach ($value as $i => $v) {
+              $value[$i] = check_plain($v);
+            }
+            $values["location-{$field}_{$key}"] = $value;
+          }
+          else {
+            $values["location-{$field}_{$key}"] = check_plain($value);
+          }
         }
         // Backwards compatibility.
         $values["location-provincename_$key"] = $values["location-province_name_$key"];