userdir fixes

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 960d4da990e767837daea2bcfa9de0ff850e6a09..8f7d8d20b4f22381e18cb556249a64ccb3887b8b 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -320,7 +320,7 @@ sub bestlink ($$) { #{{{
        } while $cwd=~s!/?[^/]+$!!;
 
        if (length $config{userdir} && exists $links{"$config{userdir}/".lc($link)}) {
-               return $links{"$config{userdir}/".lc($link)};
+               return "$config{userdir}/".lc($link);
        }
 
        #print STDERR "warning: page $page, broken link: $link\n";

diff --git a/Makefile.PL b/Makefile.PL
index e0eaf4e32b56f97f6b3c9a5b74794fd69bbd3af5..ab67aae7410b7ad0386dc034c9ba6d485b2c4ff8 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -26,7 +26,7 @@ PROBABLE_INST_LIB=$(shell \\
 extra_build:
        ./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \
                --wikiname="ikiwiki" --verbose --no-rcs \
-               --exclude=/discussion --no-discussion \
+               --exclude=/discussion --no-discussion --userdir=users \
                --plugin=goodstuff \
                --plugin=haiku --plugin=polygen --plugin=fortune
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man

diff --git a/ikiwiki.in b/ikiwiki.in
index c762712ba3caf1e7a62d44befef0dbb7b39c113b..5b1f57d16314bef6add96735c2737a7170a7d2ec 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -46,6 +46,7 @@ sub getconfig () { #{{{
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
+                       "userdir=s" => \$config{userdir},
                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },