diff options
| -rw-r--r-- | perllib/Page.pm | 10 | ||||
| -rwxr-xr-x | web/index.cgi | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm index df914dd3b..9c936954e 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: Page.pm,v 1.69 2007-12-15 18:07:28 matthew Exp $ +# $Id: Page.pm,v 1.70 2008-01-03 15:00:23 matthew Exp $ # package Page; @@ -512,16 +512,16 @@ sub geocode_string { if (!$js) { $error = 'Sorry, we had a problem parsing that location. Please try again.'; - } elsif ($js =~ /BT\d/) { - # Northern Ireland, hopefully - $error = "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include any maps for the region."; } elsif ($js !~ /"code":200/) { $error = 'Sorry, we could not understand that location.'; } elsif ($js =~ /},{/) { # Multiple while ($js =~ /"address":"(.*?)"/g) { - push (@$error, $1); + push (@$error, $1) unless $1 =~ /BT\d/; } $error = 'Sorry, we could not understand that location.' unless $error; + } elsif ($js =~ /BT\d/) { + # Northern Ireland, hopefully + $error = "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include any maps for the region."; } else { my ($accuracy) = $js =~ /"Accuracy": (\d)/; if ($accuracy < 4) { diff --git a/web/index.cgi b/web/index.cgi index 8cbaee81b..3da3e113d 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: index.cgi,v 1.168 2007-10-30 09:23:02 matthew Exp $ +# $Id: index.cgi,v 1.169 2008-01-03 15:00:23 matthew Exp $ use strict; use Standard; @@ -523,7 +523,7 @@ $category <input type="text" value="$input_h{email}" name="email" id="form_email" size="30"></div> <div><label for="form_phone">Phone:</label> <input type="text" value="$input_h{phone}" name="phone" id="form_phone" size="20"> -<small>(optional, so the council can get in touch)</small></div> +<small>(optional)</small></div> EOF if (my $token = $input{flickr}) { my $id = mySociety::AuthToken::retrieve('flickr', $token); |