diff options
| author | Joey Hess <joey@kitenet.net> | 2012-08-05 22:02:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-05 22:02:39 -0400 |
| commit | d926c4aca9679cf2f259bd8bb0ee678eed43e30d (patch) | |
| tree | 188ce16f3b49af71aaa6fe6d1d4a65821c85e893 | |
| parent | 409c4e48f983d10aceb6321148d7f440d17eb28f (diff) | |
| download | ikiwiki-d926c4aca9679cf2f259bd8bb0ee678eed43e30d.tar ikiwiki-d926c4aca9679cf2f259bd8bb0ee678eed43e30d.tar.gz | |
merged anarcat's osm fixes
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a77c42e42..bf4ff9db1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low in the recentchanges page, with visibility toggleable via javascript. Thanks, Antoine Beaupré * Split CFLAGS into words when building wrapper. Closes: #682237 + * osm: Avoid calling urlto before generated files are registered. + Thanks, Philippe Gauthier and Antoine Beaupré + * osm: Add osm_openlayers_url configuration setting. + Thanks, Genevieve -- Joey Hess <joeyh@debian.org> Thu, 19 Jul 2012 13:46:52 -0400 diff --git a/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn b/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn index 6420e133d..89c08b73c 100644 --- a/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn +++ b/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn @@ -8,10 +8,16 @@ Indeed, that URL yields a 404. The proper URL is <http://mesh.openisp.ca/map/poi ## Proposed solution -The problem seems to be caused by `urlto()` being called for the `osm` directive before the generated files are registered with `will_render()` from the `waypoint` directive. Proposed patch adds a function that is called from the `preprocess` hook for both directives that registers the files. +The problem seems to be caused by `urlto()` being called for the `osm` +directive before the generated files are registered with `will_render()` +from the `waypoint` directive. Proposed patch adds a function that is +called from the `preprocess` hook for both directives that registers the +files. Here is a [[patch]] to IkiWiki/Plugin/osm.pm: <https://reseaulibre.deuxpi.ca/0000-Fix-incorrect-URL-pointing-to-the-generated-waypoint.patch> --[[deuxpi]] I confirm the patch works, and I added it to my master branch. --[[anarcat]] + +> [[applied|done]]. Thanks guys. --[[Joey]] |