aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App/View/Web.pm
diff options
context:
space:
mode:
authorDave Arter <davea@mysociety.org>2015-10-06 11:50:48 +0100
committerDave Arter <davea@mysociety.org>2015-10-06 11:50:48 +0100
commit2ed2c57659c0d288cd1cec391baef9faf002030d (patch)
tree742c5ad6e4671050805292061f85e9ff6ec308a0 /perllib/FixMyStreet/App/View/Web.pm
parentde8ba7899dd4692cdf062f4b2735157f7fd14cb7 (diff)
parentffc03ca3330a43a98a3728df6f3d56c7fc1837d1 (diff)
Merge branch 'zurich-2015-dev-candidate'
This is the work done in early 2015 to improve the Zürich admin interface, primarily.
Diffstat (limited to 'perllib/FixMyStreet/App/View/Web.pm')
-rw-r--r--perllib/FixMyStreet/App/View/Web.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index 9cc571efc..37a81e444 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -133,6 +133,9 @@ sub escape_js {
'>' => 'u003e',
);
$text =~ s/([\\"'<>])/\\$lookup{$1}/g;
+
+ $text =~ s/(?:\r\n|\n|\r)/\\n/g; # replace newlines
+
return $text;
}