diff options
| -rw-r--r-- | conf/httpd.conf | 6 | ||||
| -rw-r--r-- | perllib/Page.pm | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/conf/httpd.conf b/conf/httpd.conf index 9750743f1..92696223d 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.30 2008-04-14 12:14:44 matthew Exp $ +# $Id: httpd.conf,v 1.31 2008-05-14 11:18:35 matthew Exp $ DirectoryIndex index.cgi @@ -61,6 +61,10 @@ RewriteRule ^/reports/([^/]+)$ /reports.cgi?council=$1 [QS RewriteRule ^/rss/area/([0-9]+)$ /rss.cgi?type=area_problems;id=$1 [QSA] RewriteRule ^/rss/(reports|area)/([^/]+)$ /reports.cgi?rss=$1;council=$2 [QSA] +# Fix incorrect RSS urls caused by my stupidity +RewriteRule ^/{/rss/(.*)}$ /rss/$1 [R=permanent] +RewriteRule ^/reports/{/rss/(.*)}$ /reports/rss/$1 [R=permanent] + RewriteRule ^/report/([0-9]+)$ /index.cgi?id=$1 [QSA] RewriteRule ^/alerts/?$ /alert [R=permanent] diff --git a/perllib/Page.pm b/perllib/Page.pm index f3031286a..10ce9fd91 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.97 2008-05-14 11:12:28 matthew Exp $ +# $Id: Page.pm,v 1.98 2008-05-14 11:18:35 matthew Exp $ # package Page; @@ -147,7 +147,7 @@ EOF $html .= '<div id="wrapper"><div id="content">'; } if ($params{rss}) { - $html =~ s#<!-- RSS -->#<link rel="alternate" type="application/rss+xml" title="'$params{rss}[0]" href="$params{rss}[1]">#; + $html =~ s#<!-- RSS -->#<link rel="alternate" type="application/rss+xml" title="$params{rss}[0]" href="$params{rss}[1]">#; } if (mySociety::Config::get('STAGING_SITE')) { $html .= '<p id="error">This is a developer site; things might break at any time, and councils are not sent emails (they\'d get annoyed!).</p>'; |