From 137a87afd5dac7bb248be02d1277d6a007171aa2 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 29 Dec 2006 05:58:33 +0000
Subject: userdir fixes

---
 IkiWiki.pm  | 2 +-
 Makefile.PL | 2 +-
 ikiwiki.in  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 960d4da99..8f7d8d20b 100644
--- 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 e0eaf4e32..ab67aae74 100755
--- 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 c762712ba..5b1f57d16 100755
--- 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];
 			},
-- 
cgit v1.2.3