aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/osm.pm1
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index b8255bb13..472e26945 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -589,6 +589,7 @@ sub map_setup_code($;@) {
}
$options{'layers'} = $config{osm_layers};
+ $name=~s/'//g; # $name comes from user input
return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");";
}
diff --git a/debian/changelog b/debian/changelog
index 7eeec77f9..64427e34f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20140103) UNRELEASED; urgency=medium
* inline: Allow overriding the title of the feed. Closes: #735123
Thanks, Christophe Rhodes
+ * osm: Escape name parameter. Closes: #731797
-- Joey Hess <joeyh@debian.org> Mon, 13 Jan 2014 17:06:01 -0400