From 34e78aa47e8cad5ba237705dd8a2fa1d1403ff20 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 3 Jun 2011 15:20:39 +0100
Subject: Better alert page title handling.

---
 perllib/FixMyStreet/App/Controller/Alert.pm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'perllib/FixMyStreet/App/Controller/Alert.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Alert.pm b/perllib/FixMyStreet/App/Controller/Alert.pm
index b8b7cce40..98e1236e1 100644
--- a/perllib/FixMyStreet/App/Controller/Alert.pm
+++ b/perllib/FixMyStreet/App/Controller/Alert.pm
@@ -332,9 +332,6 @@ sub prettify_pc : Private {
         my $pretty_pc_text = $pretty_pc;
         $pretty_pc_text =~ s/ //g;
         $c->stash->{pretty_pc_text} = $pretty_pc_text;
-
-        # this may be better done in template
-        $pretty_pc =~ s/ /&nbsp;/;
     }
 
     $c->stash->{pretty_pc} = $pretty_pc;
-- 
cgit v1.2.3


From c10a787f1f529cadae06fd9c8dff58ca7224d223 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 3 Jun 2011 15:48:26 +0100
Subject: Fix RSS lat/lon redirect from alert list page; break setenv.pl's ARGV
 feature.

---
 perllib/FixMyStreet/App/Controller/Alert.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'perllib/FixMyStreet/App/Controller/Alert.pm')

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 {
-- 
cgit v1.2.3