From c5f9b016621d20766196a0859508a083a486b4cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Jun 2013 14:14:52 -0400 Subject: [PATCH 1/1] osm: Remove trailing slash from KML maps icon. --- IkiWiki/Plugin/osm.pm | 1 + debian/changelog | 1 + doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn | 2 ++ 3 files changed, 4 insertions(+) diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm index a7baa5f2b..c9650d014 100644 --- a/IkiWiki/Plugin/osm.pm +++ b/IkiWiki/Plugin/osm.pm @@ -192,6 +192,7 @@ sub process_waypoint { } } $icon = urlto($icon, $dest, 1); + $icon =~ s!/*$!!; # hack - urlto shouldn't be appending a slash in the first place $tag = '' unless $tag; register_rendered_files($map, $page, $dest); $pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = { diff --git a/debian/changelog b/debian/changelog index 10e0e84ff..e817deb9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low * calendar: When there are multiple pages for a given day, they're displayed in a popup on mouseover. Thanks, Louis + * osm: Remove trailing slash from KML maps icon. -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 diff --git a/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn b/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn index 0677d0e74..a3a88d138 100644 --- a/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn +++ b/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn @@ -30,3 +30,5 @@ index a7baa5f..c9650d0 100644 """]] I'm not writing this to a branch out of sheer shame of my misunderstanding. ;) There also may be a workaround that could be done in Nginx too. --[[anarcat]] + +> [[applied|done]], but I'm not happy with this either --[[Joey]] -- 2.39.5