remove misc.tmpl checking

Turns out that users with a modified page.tmpl need to modify it on
upgrade, at least to add the FORCEBASEURL (so edit preview works),
so there is no point in trying to retain compatability.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 54271beccac03847003bc0ea2c92e90433238df7..72f416489c1d267df30d5929fd0679f9598c8693 100644 (file)
--- 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 0c3a99f0e83a82faf1c3ddebad8cfea2b41d6b6d..6b4ba759220e8707670619872aee606589d58fa2 100644 (file)
--- 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 729d22fb87483e44de1d2f94acf5cd26ecffe08f..e257c21a221b33a2f6014e99d7b59dcb863bc8b6 100644 (file)
--- 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