urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userdir fixes

master
joey 2006-12-29 05:58:33 +00:00
parent f62d23f008
commit 137a87afd5
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki.pm
View File

@ -320,7 +320,7 @@ sub bestlink ($$) { #{{{
} while $cwd=~s!/?[^/]+$!!; } while $cwd=~s!/?[^/]+$!!;
if (length $config{userdir} && exists $links{"$config{userdir}/".lc($link)}) { 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"; #print STDERR "warning: page $page, broken link: $link\n";

2
Makefile.PL
View File

@ -26,7 +26,7 @@ PROBABLE_INST_LIB=$(shell \\
extra_build: extra_build:
./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \ ./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \
--wikiname="ikiwiki" --verbose --no-rcs \ --wikiname="ikiwiki" --verbose --no-rcs \
--exclude=/discussion --no-discussion \ --exclude=/discussion --no-discussion --userdir=users \
--plugin=goodstuff \ --plugin=goodstuff \
--plugin=haiku --plugin=polygen --plugin=fortune --plugin=haiku --plugin=polygen --plugin=fortune
./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man

1
ikiwiki.in
View File

@ -46,6 +46,7 @@ sub getconfig () { #{{{
"timeformat=s" => \$config{timeformat}, "timeformat=s" => \$config{timeformat},
"sslcookie!" => \$config{sslcookie}, "sslcookie!" => \$config{sslcookie},
"httpauth!" => \$config{httpauth}, "httpauth!" => \$config{httpauth},
"userdir=s" => \$config{userdir},
"exclude=s@" => sub { "exclude=s@" => sub {
push @{$config{wiki_file_prune_regexps}}, $_[1]; push @{$config{wiki_file_prune_regexps}}, $_[1];
}, },