aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthew <matthew>2007-08-23 11:54:17 +0000
committermatthew <matthew>2007-08-23 11:54:17 +0000
commit8da784b81433a4b5482de45c9b2635cf98863f06 (patch)
treef2673b6ecb5207a1f79a2c5ff66b31b5d7a97695
parentce9f7086f13b7b1cc8cb8f9c56f87ef0db0a54a3 (diff)
Replace & with and to avoid the Apache mod_rewrite issue.
-rwxr-xr-xweb/reports.cgi4
1 files changed, 3 insertions, 1 deletions
diff --git a/web/reports.cgi b/web/reports.cgi
index a41ec15e7..d6969a351 100755
--- a/web/reports.cgi
+++ b/web/reports.cgi
@@ -6,7 +6,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: matthew@mysociety.org. WWW: http://www.mysociety.org
#
-# $Id: reports.cgi,v 1.2 2007-08-23 11:49:14 matthew Exp $
+# $Id: reports.cgi,v 1.3 2007-08-23 11:54:17 matthew Exp $
use strict;
require 5.8.0;
@@ -40,6 +40,7 @@ sub main {
my $all = $q->param('all') || 0;
my $one_council = $q->param('council') || '';
if ($one_council =~ /\D/) {
+ $one_council =~ s/ and / & /;
$one_council = mySociety::MaPit::get_voting_area_by_name("$one_council ", $mySociety::VotingArea::council_parent_types);
if (keys %$one_council == 1) {
($one_council) = keys %$one_council;
@@ -174,5 +175,6 @@ sub short_name {
$name =~ s/ Council$//;
$name = uri_escape($name);
$name =~ s/%20/+/g;
+ $name =~ s/ & / and /;
return $name;
}