aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-01-15 15:53:51 -0400
committerJoey Hess <joey@kitenet.net>2014-01-15 15:53:51 -0400
commita8d7a99979ed1a92fdf63ee7b251c17e41c0acb0 (patch)
treee2c8cc5b45c5487a436923cf8e8266036d290bd0
parent4c3a2a135766ea18ffd24b4ae956dc0dc4a27380 (diff)
downloadikiwiki-a8d7a99979ed1a92fdf63ee7b251c17e41c0acb0.tar
ikiwiki-a8d7a99979ed1a92fdf63ee7b251c17e41c0acb0.tar.gz
osm: Escape name parameter. Closes: #731797
-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