diff options
| -rw-r--r-- | perllib/Cobrands/Barnet/Util.pm | 4 | ||||
| -rw-r--r-- | perllib/Problems.pm | 10 | ||||
| -rwxr-xr-x | web/alert.cgi | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/perllib/Cobrands/Barnet/Util.pm b/perllib/Cobrands/Barnet/Util.pm index 32973c10c..ad6fa3919 100644 --- a/perllib/Cobrands/Barnet/Util.pm +++ b/perllib/Cobrands/Barnet/Util.pm @@ -104,9 +104,9 @@ sub disambiguate_location { } sub recent_photos { - my ($self, $num, $e, $n, $dist) = @_; + my ($self, $num, $lat, $lon, $dist) = @_; $num = 2 if $num == 3; - return Problems::recent_photos($num, $e, $n, $dist); + return Problems::recent_photos($num, $lat, $lon, $dist); } 1; diff --git a/perllib/Problems.pm b/perllib/Problems.pm index 263d58bc9..c81c72fbd 100644 --- a/perllib/Problems.pm +++ b/perllib/Problems.pm @@ -87,18 +87,18 @@ sub recent_new { # Front page recent lists sub recent_photos { - my ($num, $e, $n, $dist) = @_; + my ($num, $lat, $lon, $dist) = @_; my $probs; - if ($e) { - my $key = "recent_photos:$site_key:$num:$e:$n:$dist"; + if (defined $lat) { + my $key = "recent_photos:$site_key:$num:$lat:$lon:$dist"; $probs = Memcached::get($key); unless ($probs) { $probs = select_all("select id, title - from problem_find_nearby_easting_northing(?, ?, ?) as nearby, problem + from problem_find_nearby(?, ?, ?) as nearby, problem where nearby.problem_id = problem.id and state in ('confirmed', 'fixed') and photo is not null $site_restriction - order by confirmed desc limit $num", $e, $n, $dist); + order by confirmed desc limit $num", $lat, $lon, $dist); Memcached::set($key, $probs, 3600); } } else { diff --git a/web/alert.cgi b/web/alert.cgi index 71249759e..3c04bf306 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -205,7 +205,7 @@ for the county council.'))) . '</div><div id="rss_buttons">'; my $checked = ''; $checked = ' checked' if $q->param('feed') && $q->param('feed') eq "local:$e:$n"; my $cobrand_form_elements = Cobrand::form_elements($cobrand, 'alerts', $q); - my $pics = Cobrand::recent_photos($cobrand, 5, $e, $n, $dist); + my $pics = Cobrand::recent_photos($cobrand, 5, $lat, $lon, $dist); $pics = '<div id="alert_photos">' . $q->h2(_('Photos of recent nearby reports')) . $pics . '</div>' if $pics; my $header; if ($pretty_pc) { |