aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-06-23 14:14:52 -0400
committerJoey Hess <joey@kitenet.net>2013-06-23 14:14:52 -0400
commitc5f9b016621d20766196a0859508a083a486b4cb (patch)
tree10b6f177f920414298f56aa5faf87e13e1c89171
parentb8d65da266e45e81356dcf60b28209b75a437973 (diff)
downloadikiwiki-c5f9b016621d20766196a0859508a083a486b4cb.tar
ikiwiki-c5f9b016621d20766196a0859508a083a486b4cb.tar.gz
osm: Remove trailing slash from KML maps icon.
-rw-r--r--IkiWiki/Plugin/osm.pm1
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn2
3 files changed, 4 insertions, 0 deletions
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 <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 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]]