update

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index faca32835b095f7c428b3f74d0aabddc25b59d1c..8f7d8d20b4f22381e18cb556249a64ccb3887b8b 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -129,6 +129,8 @@ sub loadplugins () { #{{{
 sub loadplugin ($) { #{{{
        my $plugin=shift;
 
+       return if grep { $_ eq $plugin} @{$config{disable_plugins}};
+
        my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
        eval qq{use $mod};
        if ($@) {
@@ -317,6 +319,10 @@ sub bestlink ($$) { #{{{
                }
        } while $cwd=~s!/?[^/]+$!!;
 
+       if (length $config{userdir} && exists $links{"$config{userdir}/".lc($link)}) {
+               return "$config{userdir}/".lc($link);
+       }
+
        #print STDERR "warning: page $page, broken link: $link\n";
        return "";
 } #}}}