aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perllib/FixMyStreet/App/Controller/Alert.pm3
-rwxr-xr-xsetenv.pl8
2 files changed, 5 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Alert.pm b/perllib/FixMyStreet/App/Controller/Alert.pm
index 98e1236e1..bea5345e3 100644
--- a/perllib/FixMyStreet/App/Controller/Alert.pm
+++ b/perllib/FixMyStreet/App/Controller/Alert.pm
@@ -96,8 +96,7 @@ sub rss : Private {
$c->res->redirect($url);
}
elsif ( $feed =~ /^local:([\d\.-]+):([\d\.-]+)$/ ) {
- ( my $id = $1 ) =~ tr{:_}{/+};
- $url = $c->cobrand->base_url() . '/rss/l/' . $id;
+ $url = $c->cobrand->base_url() . '/rss/l/' . $1 . ',' . $2;
$c->res->redirect($url);
}
else {
diff --git a/setenv.pl b/setenv.pl
index 1d4ca3d2b..b5461f30e 100755
--- a/setenv.pl
+++ b/setenv.pl
@@ -34,12 +34,12 @@ $ENV{PATH} = join ':', uniq "$root/bin", split( m/:/, $ENV{PATH} );
# now decide what to do - if no arguments print out shell arguments to set the
# environment. If there are arguments then run those so that they run correctly
-if (@ARGV) {
- system @ARGV;
-}
+#if (@ARGV) {
+# system @ARGV;
+#}
# we might want to require this file to configure something like a CGI script
-elsif ( $0 eq __FILE__ ) {
+if ( $0 eq __FILE__ ) {
my @keys = sort 'PATH', grep { m{^PERL} } keys %ENV;