projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
force list context
[ikiwiki.git]
/
IkiWiki.pm
diff --git
a/IkiWiki.pm
b/IkiWiki.pm
index d2ed999239b16a36de61bfcff65f892bb8bbd642..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") {