osm: Remove trailing slash from KML maps icon.

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index a7baa5f2b968ebb0464a787be7371a26a2f98423..c9650d014aa1348f9c83efb77e87c76f20620452 100644 (file)
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -192,6 +192,7 @@ sub process_waypoint {
                }
        }
        $icon = urlto($icon, $dest, 1);
                }
        }
        $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} = {
        $tag = '' unless $tag;
        register_rendered_files($map, $page, $dest);
        $pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {

diff --git a/debian/changelog b/debian/changelog
index 10e0e84ffc8e9836bcff7bf645192c66f4861105..e817deb9bbe8426637a3b29cbecde4eaee2c6310 100644 (file)
--- 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
   * 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 <joeyh@debian.org>  Sun, 23 Jun 2013 14:02:01 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  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 0677d0e74725cbac67a11c18ef95038d3f8c4cc1..a3a88d138b8098326485c51403f5c202a099a609 100644 (file)
--- 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]]
 """]]
 
 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]]