From: Joey Hess <joey@kitenet.net>
Date: Wed, 15 Jan 2014 19:53:51 +0000 (-0400)
Subject: osm: Escape name parameter. Closes: #731797
X-Git-Tag: debian/3.20140125~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a8d7a99979ed1a92fdf63ee7b251c17e41c0acb0

osm: Escape name parameter. Closes: #731797
---

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