Hopefully fix issue with council reports pagination display, link in RSS feed, and nofollow map links.

2 files changed, 14 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index f7fb5dec5..93af3393c 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -319,8 +319,20 @@ sub load_and_group_problems : Private {
     };
     if ($c->stash->{ward}) {
         $where->{areas} = { 'like', '%,' . $c->stash->{ward}->{id} . ',%' };
+        $where->{council} = [
+            undef,
+            $c->stash->{council}->{id},
+            { 'like', $c->stash->{council}->{id} . ',%' },
+            { 'like', '%,' . $c->stash->{council}->{id} },
+        ];
     } elsif ($c->stash->{council}) {
         $where->{areas} = { 'like', '%,' . $c->stash->{council}->{id} . ',%' };
+        $where->{council} = [
+            undef,
+            $c->stash->{council}->{id},
+            { 'like', $c->stash->{council}->{id} . ',%' },
+            { 'like', '%,' . $c->stash->{council}->{id} },
+        ];
     }
     my $problems = $c->cobrand->problems->search(
         $where,
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',
     );