diff options
| -rw-r--r-- | IkiWiki/Plugin/osm.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm index 472e26945..a5af4ed21 100644 --- a/IkiWiki/Plugin/osm.pm +++ b/IkiWiki/Plugin/osm.pm @@ -14,7 +14,7 @@ sub import { hook(type => "format", id => "osm", call => \&format); hook(type => "preprocess", id => "osm", call => \&preprocess); hook(type => "preprocess", id => "waypoint", call => \&process_waypoint); - hook(type => "savestate", id => "waypoint", call => \&savestate); + hook(type => "changes", id => "waypoint", call => \&changes); hook(type => "cgi", id => "osm", call => \&cgi); } @@ -280,7 +280,7 @@ sub scrub_lonlat($$$) { return ($lon, $lat); } -sub savestate { +sub changes { my %waypoints = (); my %linestrings = (); diff --git a/debian/changelog b/debian/changelog index 455e5981f..437890a7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ ikiwiki (3.20170112) UNRELEASED; urgency=medium default when using the default Discount implementation. A new mdwn_alpha_list option can be used to restore the old interpretation. + * osm: Convert savestate hook into a changes hook. savestate is not + the right place to write wiki content, and in particular this + breaks websetup if osm's dependencies are not installed, even + if the osm plugin is not actually enabled. (Closes: #719913) -- Simon McVittie <smcv@debian.org> Sun, 14 May 2017 15:34:52 +0100 |