summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-29 14:20:31 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-29 14:20:31 -0400
commit33a0e84ddbb9fe9c068cb40641ccec8554514151 (patch)
treef3ae5098c1dd31056f67f0a7eff5576a4a4f8f5a
parent7237fc7f2e96557e06caf48f97db9b041ffa870b (diff)
fix preview of shortcuts
Move shortcut processing back to checkconfig, and avoid it failing if the srcdir is not defined.
-rw-r--r--IkiWiki/Plugin/shortcut.pm18
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/cannot_preview_shortcuts.mdwn2
3 files changed, 13 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 7bfce586f..77131edb0 100644
--- 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 299cf1af2..4547cda3d 100644
--- 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 a2fd3533a..2e7ef13b7 100644
--- 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]]