summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-11-13 15:10:58 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-11-13 15:10:58 -0500
commitad303e878e65c72bf31eb676ced866be56bbee91 (patch)
treef160e7a3df38f6004f2ca68a1570d5973b36ccf0 /IkiWiki/Plugin
parent5ccf68f11329779f9e173355fe76bff85203a851 (diff)
inline: Allow direct inclusion of non-page files in raw mode.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/inline.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 001d2ed1a..8e7fa9958 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -337,7 +337,7 @@ sub preprocess_inline (@) {
foreach my $page (@list) {
my $file = $pagesources{$page};
my $type = pagetype($file);
- if (! $raw || ($raw && ! defined $type)) {
+ if (! $raw) {
if ($needcontent) {
# Get the content before populating the
# template, since getting the content uses
@@ -391,6 +391,10 @@ sub preprocess_inline (@) {
filter($page, $params{destpage},
readfile(srcfile($file)))));
}
+ else {
+ $ret.="\n".
+ readfile(srcfile($file));
+ }
}
}
}