Add some more error handling of odd RSS.

1 files changed, 6 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index c3a6003c6..144e6e227 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -162,6 +162,10 @@ sub rss_area_ward : Path('/rss/area') : Args(2) {
     $area =~ s/\+/ /g;
     $area =~ s/\.html//;
 
+    # XXX Currently body/area overlaps here are a bit muddy.
+    # We're checking an area here, but this function is currently doing that.
+    return if $c->cobrand->reports_body_check( $c, $area );
+
     # If we're passed an ID number (don't think this is used anywhere, it
     # certainly shouldn't be), just look that up on mapit and redirect
     if ($area =~ /^\d+$/) {
@@ -186,6 +190,8 @@ sub rss_area_ward : Path('/rss/area') : Args(2) {
         }
     }
 
+    $c->detach( 'redirect_index' ) unless $c->stash->{area};
+
     $c->forward( 'ward_check', [ $ward ] ) if $ward;
 
     my $url = $c->cobrand->short_name( $c->stash->{area} );