diff options
author | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
---|---|---|
committer | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
commit | 592924059a07a5a30e8a09dfc4ca8dea56c5c77a (patch) | |
tree | c99e86d3e3f780427bbf7a9ec0ae5187b697dfa5 /perllib/FixMyStreet/Map.pm | |
parent | 65066d275557e16448aa99ecdfa4df62d4d79649 (diff) | |
parent | d92bbef188eff6c14adf0f0c7b032846b1be85a6 (diff) |
Merge remote-tracking branch 'origin/master' into send-report-rewrite
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'perllib/FixMyStreet/Map.pm')
-rw-r--r-- | perllib/FixMyStreet/Map.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm index 2bccf1584..08bba3285 100644 --- a/perllib/FixMyStreet/Map.pm +++ b/perllib/FixMyStreet/Map.pm @@ -95,8 +95,10 @@ sub _map_features { my $around_limit = $c->cobrand->on_map_list_limit || undef; my @around_args = ( $min_lat, $max_lat, $min_lon, $max_lon, $interval ); - my $around_map_list = $c->cobrand->problems->around_map( @around_args, $around_limit ); my $around_map = $c->cobrand->problems->around_map( @around_args, undef ); + my $around_map_list = $around_limit + ? $c->cobrand->problems->around_map( @around_args, $around_limit ) + : $around_map; my $dist; mySociety::Locale::in_gb_locale { |