fix preview of shortcuts

Move shortcut processing back to checkconfig, and avoid it failing if the
srcdir is not defined.

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 7bfce586f5b7a920e7ed8020e6e0becef623b991..77131edb07ac588a7108f5659e686ce1954a45d7 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -7,7 +7,7 @@ use IkiWiki 2.00;
 
 sub import { #{{{
        hook(type => "getsetup", id => "shortcut", call => \&getsetup);
-       hook(type => "refresh", id => "shortcut", call => \&refresh);
+       hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
        hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
 } #}}}
 
@@ -19,14 +19,16 @@ sub getsetup () { #{{{
                },
 } #}}}
 
-sub refresh () { #{{{
-       # Preprocess the shortcuts page to get all the available shortcuts
-       # defined before other pages are rendered.
-       my $srcfile=srcfile("shortcuts.mdwn", 1);
-       if (! defined $srcfile) {
-               error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+sub checkconfig () { #{{{
+       if (defined $config{srcdir}) {
+               # Preprocess the shortcuts page to get all the available shortcuts
+               # defined before other pages are rendered.
+               my $srcfile=srcfile("shortcuts.mdwn", 1);
+               if (! defined $srcfile) {
+                       error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+               }
+               IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
        }
-       IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 } # }}}
 
 sub preprocess_shortcut (@) { #{{{

diff --git a/debian/changelog b/debian/changelog
index 299cf1af25ac0ae820949604b7970659611d5bc9..4547cda3d551ccd5ee53c0a8121af135bde1293a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
   * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
+  * shortcut: Fix display of shortcuts while previewing.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 

diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
index a2fd3533ae5131d4316c42823d1b84295b73111a..2e7ef13b78b7ca0c6917b40fd9d359b5c28d7fc5 100644 (file)
--- a/doc/bugs/cannot_preview_shortcuts.mdwn
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -1,2 +1,4 @@
 Shortcuts such as \[[!google foo]] do not work when previewing pages.
 --[[JasonBlevins]]
+
+> Broken during the setup dumping changes, now fixed. --[[Joey]] [[done]]