projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
response
[ikiwiki.git]
/
IkiWiki.pm
diff --git
a/IkiWiki.pm
b/IkiWiki.pm
index 27fa4ca17dd3a17fa6768acb5e496758a3eb55a7..203da3ba2d647740e5a3a80193873b39ebd41773 100644
(file)
--- a/
IkiWiki.pm
+++ b/
IkiWiki.pm
@@
-592,10
+592,11
@@
sub loadplugins () {
return 1;
}
return 1;
}
-sub loadplugin ($) {
+sub loadplugin ($
;$
) {
my $plugin=shift;
my $plugin=shift;
+ my $force=shift;
- return if grep { $_ eq $plugin} @{$config{disable_plugins}};
+ return if
! $force &&
grep { $_ eq $plugin} @{$config{disable_plugins}};
foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
"$installdir/lib/ikiwiki") {
foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
"$installdir/lib/ikiwiki") {
@@
-1739,11
+1740,20
@@
sub template ($;@) {
sub misctemplate ($$;@) {
my $title=shift;
my $content=shift;
sub misctemplate ($$;@) {
my $title=shift;
my $content=shift;
+ my %params=@_;
my $template=template("page.tmpl");
my $template=template("page.tmpl");
+ my $page="";
+ if (exists $params{page}) {
+ $page=delete $params{page};
+ }
run_hooks(pagetemplate => sub {
run_hooks(pagetemplate => sub {
- shift->(page => "", destpage => "", template => $template);
+ shift->(
+ page => $page,
+ destpage => $page,
+ template => $template,
+ );
});
templateactions($template, "");
});
templateactions($template, "");
@@
-1754,7
+1764,7
@@
sub misctemplate ($$;@) {
content => $content,
baseurl => baseurl(),
html5 => $config{html5},
content => $content,
baseurl => baseurl(),
html5 => $config{html5},
-
@_
,
+
%params
,
);
return $template->output;
);
return $template->output;