From: Joey Hess <joey@kitenet.net>
Date: Tue, 13 Mar 2012 21:48:27 +0000 (-0400)
Subject: avoid double amp escaping
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/5b5731182f99808f533d691408dc651a435be43b?ds=sidebyside

avoid double amp escaping
---

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 9f43e03e6..91f23ba1f 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -176,7 +176,8 @@ sub process_waypoint {
 		zoom => $zoom,
 	);
 	if (defined($destsources{htmlpage($map)})) {
-		$href = urlto($map,$page) . "?lat=$lat&lon=$lon&zoom=$zoom";
+		$href = urlto($map,$page) . "?lat=$lat&amp;lon=$lon&amp;zoom=$zoom";
+		$href =~ s!&!&amp;!g;
 	}
 	$pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {
 		page => $page,
@@ -196,7 +197,6 @@ sub process_waypoint {
 		$output .= preprocess(%params);
 	}
 	if (!$hidden) {
-		$href =~ s!&!&amp;!g;
 		$output .= "<a href=\"$href\"><img class=\"img\" src=\"$icon\" $alt /></a>";
 	}
 	return $output;