diff options
| -rw-r--r-- | conf/httpd.conf | 3 | ||||
| -rwxr-xr-x | web/reports.cgi | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/conf/httpd.conf b/conf/httpd.conf index aaad9112b..399e9f1e2 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -20,7 +20,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org # -# $Id: httpd.conf,v 1.21 2007-08-23 11:45:43 matthew Exp $ +# $Id: httpd.conf,v 1.22 2007-08-23 11:58:06 matthew Exp $ DirectoryIndex index.cgi @@ -28,6 +28,7 @@ RewriteEngine on #RewriteLog /var/log/apache/rewrite.log #RewriteLogLevel 3 +RewriteRule ^admin/ - [L] RewriteRule ^(.+)/$ $1 [R=permanent] RewriteRule ^/[Aa]/([0-9A-Za-z]{16}).*$ /alert.cgi?token=$1 diff --git a/web/reports.cgi b/web/reports.cgi index d6969a351..7194685c6 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.3 2007-08-23 11:54:17 matthew Exp $ +# $Id: reports.cgi,v 1.4 2007-08-23 11:58:07 matthew Exp $ use strict; require 5.8.0; @@ -173,8 +173,8 @@ sub short_name { return 'Durham+City' if ($name eq 'Durham City Council'); $name =~ s/ (Borough|City|District|County) Council$//; $name =~ s/ Council$//; + $name =~ s/ & / and /; $name = uri_escape($name); $name =~ s/%20/+/g; - $name =~ s/ & / and /; return $name; } |