6 files changed, 11 insertions, 10 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index e4932ecd5..ae7d83f55 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -284,11 +284,11 @@ sub map_features : Private {
 
 Handle the ajax calls that the map makes when it is dragged. The info returned
 is used to update the pins on the map and the text descriptions on the side of
-the map.
+the map. Used via /around?ajax=1 but also available at /ajax for mobile app.
 
 =cut
 
-sub ajax : Private {
+sub ajax : Path('/ajax') {
     my ( $self, $c ) = @_;
 
     my $ret = $c->forward('/location/determine_location_from_bbox');
diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index 95b29d116..c7e4e5bee 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -284,7 +284,7 @@ sub output_requests : Private {
         my $display_photos = $c->cobrand->allow_photo_display($problem);
         if ($display_photos && $problem->photo) {
             my $url = $c->cobrand->base_url();
-            my $imgurl = $url . $problem->photos->[0]->{url_full};
+            my $imgurl = $url . $problem->photos->[$display_photos-1]->{url_full};
             $request->{'media_url'} = $imgurl;
         }
         push(@problemlist, $request);
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index 2302322bf..f41702dcf 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -63,7 +63,7 @@ sub index :LocalRegex('^(c/)?([1-9]\d*)(?:\.(\d+))?(?:\.(full|tn|fp))?\.(?:jpeg|
 
     $c->detach( 'no_photo' ) unless $item;
 
-    $c->detach( 'no_photo' ) unless $c->cobrand->allow_photo_display($item); # Should only be for reports, not updates
+    $c->detach( 'no_photo' ) unless $c->cobrand->allow_photo_display($item, $photo_number); # Should only be for reports, not updates
 
     my $photo;
     $photo = $item->get_photoset
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index d74af5a84..166c0614d 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -957,7 +957,7 @@ sub contacts_to_bodies : Private {
 
     my @contacts = grep { $_->category eq $category } @{$c->stash->{contacts}};
 
-    if ($c->stash->{unresponsive}{$category} || $c->stash->{unresponsive}{ALL}) {
+    if ($c->stash->{unresponsive}{$category} || $c->stash->{unresponsive}{ALL} || !@contacts) {
         [];
     } else {
         if ( $c->cobrand->call_hook('singleton_bodies_str') ) {
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 8550b745b..7c3796c42 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -440,7 +440,7 @@ sub summary : Private {
 
     # required to stop errors in generate_grouped_data
     $c->stash->{q_state} = '';
-    $c->stash->{ward} = $c->get_param('ward');
+    $c->stash->{ward} = $c->get_param('area');
     $c->stash->{start_date} = $dtf->format_date($start_date);
     $c->stash->{end_date} = $c->get_param('end_date');
 
@@ -494,7 +494,7 @@ sub export_summary_csv : Private {
             'postcode',
             'url',
         ],
-        filename => 'fixmystreet-data.csv',
+        filename => 'fixmystreet-data',
     };
     $c->forward('/dashboard/generate_csv');
 }
diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm
index 7cf4783c0..e1da4445d 100755
--- a/perllib/FixMyStreet/App/Controller/Rss.pm
+++ b/perllib/FixMyStreet/App/Controller/Rss.pm
@@ -282,14 +282,15 @@ sub add_row : Private {
     $item{pubDate} = $pubDate if $pubDate;
     $item{category} = encode_entities($row->{category}) if $row->{category};
 
-    if ($c->cobrand->allow_photo_display($row) && $row->{photo}) {
+    if ((my $photo_to_show = $c->cobrand->allow_photo_display($row)) && $row->{photo}) {
         # Bit yucky as we don't have full objects here
         my $photoset = FixMyStreet::App::Model::PhotoSet->new({ db_data => $row->{photo} });
-        my $first_fn = $photoset->get_id(0);
+        my $idx = $photo_to_show - 1;
+        my $first_fn = $photoset->get_id($idx);
         my ($hash, $format) = split /\./, $first_fn;
         my $cachebust = substr($hash, 0, 8);
         my $key = $alert_type->item_table eq 'comment' ? 'c/' : '';
-        $item{description} .= encode_entities("\n<br><img src=\"". $base_url . "/photo/$key$row->{id}.0.$format?$cachebust\">");
+        $item{description} .= encode_entities("\n<br><img src=\"". $base_url . "/photo/$key$row->{id}.$idx.$format?$cachebust\">");
     }
 
     if ( $row->{used_map} ) {