avoid double amp escaping

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 9f43e03e6138390303865fb28752644d8fb2020b..91f23ba1f65c8e8e7a366012f12a108c65de604e 100644 (file)
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -176,7 +176,8 @@ sub process_waypoint {
                zoom => $zoom,
        );
        if (defined($destsources{htmlpage($map)})) {
                zoom => $zoom,
        );
        if (defined($destsources{htmlpage($map)})) {

-               $href = urlto($map,$page) . "?lat=$lat&lon=$lon&zoom=$zoom";
+               $href = urlto($map,$page) . "?lat=$lat&lon=$lon&zoom=$zoom";
+               $href =~ s!&!&!g;

        }
        $pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {
                page => $page,
        }
        $pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {
                page => $page,


@@ -196,7 +197,6 @@ sub process_waypoint {
                $output .= preprocess(%params);
        }
        if (!$hidden) {
                $output .= preprocess(%params);
        }
        if (!$hidden) {

-               $href =~ s!&!&!g;

                $output .= "<a href=\"$href\"><img class=\"img\" src=\"$icon\" $alt /></a>";
        }
        return $output;
                $output .= "<a href=\"$href\"><img class=\"img\" src=\"$icon\" $alt /></a>";
        }
        return $output;