diff options
| -rwxr-xr-x | bin/test-run | 4 | ||||
| -rwxr-xr-x | web/index.cgi | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/test-run b/bin/test-run index e7baf62fa..76b4f0fbb 100755 --- a/bin/test-run +++ b/bin/test-run @@ -533,10 +533,10 @@ sub do_rss { my %redirects = ( - # should always go to lat lon + # should always go to lat lon, except postcode (actually, query string) '/rss/n/406886,289126' => '/rss/l/52.499994,-1.899993', '/rss/2524/1779' => '/rss/l/52.480294,-1.896931', - '/rss/pc/SW1A1AA' => '/rss/l/51.50101,-0.141587', + '/rss/pc/SW1A1AA' => '/rss/pc/SW1A1AA', '/rss/l/52.5/-1.9' => '/rss/l/52.5/-1.9', # go to reports diff --git a/web/index.cgi b/web/index.cgi index 35786057b..aa1ba31bb 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -943,6 +943,10 @@ sub display_location { } else { $rss_url = "/rss/l/$short_lat,$short_lon"; } + $rss_url = Cobrand::url( $cobrand, + NewURL($q, -retain => 1, -url=> $rss_url, + pc => undef, x => undef, y => undef, lat=> undef, lon => undef ), + $q); my %vars = ( 'map' => FixMyStreet::Map::display_map($q, @@ -953,11 +957,7 @@ sub display_location { ), map_end => FixMyStreet::Map::display_map_end(1), url_home => Cobrand::url($cobrand, '/', $q), - url_rss => Cobrand::url( - $cobrand, - NewURL($q, -retain => 1, -url=> $rss_url, - pc => undef, x => undef, y => undef, lat=> undef, lon => undef ), - $q), + url_rss => $rss_url, url_email => Cobrand::url($cobrand, NewURL($q, -retain => 1, pc => undef, lat => $short_lat, lon => $short_lon, -url=>'/alert', feed=>"local:$short_lat:$short_lon"), $q), url_skip => $url_skip, email_me => _('Email me new local problems'), @@ -978,7 +978,7 @@ sub display_location { ); my %params = ( - rss => [ _('Recent local problems, FixMyStreet'), "/rss/l/$short_lat,$short_lon" ], + rss => [ _('Recent local problems, FixMyStreet'), $rss_url ], robots => 'noindex,nofollow', ); |