diff options
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/roadmap.mdwn | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 54271becc..72f416489 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1744,7 +1744,7 @@ sub misctemplate ($$;@) { my $title=shift; my $content=shift; - my $template=template("misc.tmpl") || template("page.tmpl"); + my $template=template("page.tmpl"); run_hooks(pagetemplate => sub { shift->(page => "", destpage => "", template => $template); diff --git a/debian/changelog b/debian/changelog index 0c3a99f0e..6b4ba7592 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise a single template, page.tmpl. - * misc.tmpl will, however, still be read if a locally modified version - exists. This is to avoid forcing users to update page.tmpl right now. + * If you have a locally customised page.tmpl, it needs to be updated + to set <base> when BASEURL or FORCEBAREURL is set. -- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 18:07:29 -0400 diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn index 729d22fb8..e257c21a2 100644 --- a/doc/roadmap.mdwn +++ b/doc/roadmap.mdwn @@ -81,9 +81,6 @@ Probably incomplete list: * Enable tagbase by default (so that tag autocreation will work by default). Note that this is already done for wikis created by `auto-blog.setup`. * [[tips/html5]] on by default (some day..) -* stop reading misc.tmpl if it exists (only done in case users have a customized - version, or an outdated version of page.tmpl that cannot be used by - misctemplate) In general, we try to use [[ikiwiki-transition]] or forced rebuilds on upgrade to deal with changes that break compatability. Some things that |