From 4e41d25c998023839a7e4cc2ed96af2bd8254a18 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 12 Sep 2011 18:22:03 +0100
Subject: Hopefully fix issue with council reports pagination display, link in
 RSS feed, and nofollow map links.

---
 perllib/FixMyStreet/App/Controller/Rss.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perllib/FixMyStreet/App/Controller/Rss.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm
index 767d38c21..23345df65 100755
--- a/perllib/FixMyStreet/App/Controller/Rss.pm
+++ b/perllib/FixMyStreet/App/Controller/Rss.pm
@@ -194,7 +194,7 @@ sub generate : Private {
 
     my $out = $c->stash->{rss}->as_string;
     my $uri = $c->uri_for( '/' . $c->req->path );
-    $out =~ s{<link>(.*?)</link>}{"<link>" . $c->uri_for( $1 ) . "</link><uri>$uri</uri>"}e;
+    $out =~ s{(<link>.*?</link>)}{$1<uri>$uri</uri>};
 
     $c->response->header('Content-Type' => 'application/xml; charset=utf-8');
     $c->response->body( $out );
@@ -306,7 +306,7 @@ sub add_parameters : Private {
 
     $c->stash->{rss}->channel(
         title       => ent($title),
-        link        => $link . ($c->stash->{qs} || ''),
+        link        => $c->uri_for($link) . ($c->stash->{qs} || ''),
         description => ent($desc),
         language    => 'en-gb',
     );
-- 
cgit v1.2.3