Make link to main site better.

2 files changed, 8 insertions, 5 deletions

diff --git a/perllib/Cobrands/Barnet/Util.pm b/perllib/Cobrands/Barnet/Util.pm
index 9e837fd74..6e201cbf4 100644
--- a/perllib/Cobrands/Barnet/Util.pm
+++ b/perllib/Cobrands/Barnet/Util.pm
@@ -7,12 +7,13 @@
 # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: Util.pm,v 1.6 2009-12-22 11:44:46 matthew Exp $
+# $Id: Util.pm,v 1.7 2009-12-22 11:54:51 matthew Exp $
 
 package Cobrands::Barnet::Util;
 use Standard;
 use strict;
 use Carp;
+use URI::Escape;
 use mySociety::Web qw(ent);
 
 sub new {
@@ -73,8 +74,10 @@ sub council_check {
     if ($council_match) {
         return 1;
     }
+    my $url = 'http://www.fixmystreet.com/';
+    $url .= '?pc=' . URI::Escape::uri_escape_utf8($q->param('pc')) if $q->param('pc');
     my $error_msg = "That location is not covered by Barnet.
-Please visit <a href='http://www.fixmystreet.com/'>the main FixMyStreet site</a>.";
+Please visit <a href='$url'>the main FixMyStreet site</a>.";
     #if ($context eq 'submit_problem' or $context eq 'display_location') {
     #     $error_msg .= "You can report a problem at this location at $main_app_link.";
     #} else {
diff --git a/perllib/Page.pm b/perllib/Page.pm
index 16ddfa1c9..58c30dcae 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.227 2009-12-22 11:44:45 matthew Exp $
+# $Id: Page.pm,v 1.228 2009-12-22 11:54:50 matthew Exp $
 #
 
 package Page;
@@ -965,7 +965,7 @@ sub geocode_string {
     $s = lc($s);
     $s =~ s/[^-&0-9a-z ']/ /g;
     $s =~ s/\s+/ /g;
-    $s = uri_escape($s);
+    $s = URI::Escape::uri_escape_utf8($s);
     $s = Cobrand::disambiguate_location(get_cobrand($q), "q=$s", $q);
     $s =~ s/%20/+/g;
     my $url = 'http://maps.google.com/maps/geo?' . $s;
@@ -1043,7 +1043,7 @@ sub short_name {
     $name =~ s/ (Borough|City|District|County) Council$//;
     $name =~ s/ Council$//;
     $name =~ s/ & / and /;
-    $name = uri_escape($name);
+    $name = URI::Escape::uri_escape_utf8($name);
     $name =~ s/%20/+/g;
     return $name;
 }