aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App/Controller/Location.pm
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2016-03-28 20:38:28 +0200
committerMarius Halden <marius.h@lden.org>2016-03-28 20:38:28 +0200
commit6c1118dbf2c4b15bcfcd77600d36f2389428c75e (patch)
treeda81756a344a89502df5479b860b6f4a24b6ed92 /perllib/FixMyStreet/App/Controller/Location.pm
parenta2d67ca6de255ff04badb7cb5a62f7d3df3ce293 (diff)
parent4345263c9de752454795ad57323e684e41e702a8 (diff)
Merge tag 'v1.8.1' into fiksgatami-dev
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Location.pm')
-rw-r--r--perllib/FixMyStreet/App/Controller/Location.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm
index ff90d3d60..6def423ce 100644
--- a/perllib/FixMyStreet/App/Controller/Location.pm
+++ b/perllib/FixMyStreet/App/Controller/Location.pm
@@ -95,7 +95,8 @@ sub determine_location_from_pc : Private {
# $error doubles up to return multiple choices by being an array
if ( ref($error) eq 'ARRAY' ) {
foreach (@$error) {
- my $a = decode_utf8($_->{address});
+ my $a = $_->{address};
+ $a = decode_utf8($a) if !utf8::is_utf8($a);
$a =~ s/, United Kingdom//;
$a =~ s/, UK//;
$_->{address} = $a;