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

* Add userdir config setting.

master
joey 2006-12-19 16:58:55 +00:00
parent 9e1c79e588
commit 389ad222ec
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IkiWiki.pm
View File

@ -67,6 +67,7 @@ sub defaultconfig () { #{{{
locale => undef, locale => undef,
sslcookie => 0, sslcookie => 0,
httpauth => 0, httpauth => 0,
userdir => "",
} #}}} } #}}}
sub checkconfig () { #{{{ sub checkconfig () { #{{{

4
IkiWiki/CGI.pm
View File

@ -666,7 +666,9 @@ sub userlink ($) { #{{{
return "<a href=\"$user\">".escapeHTML($display)."</a>"; return "<a href=\"$user\">".escapeHTML($display)."</a>";
} }
else { else {
return htmllink("", "", escapeHTML($user), 1); return htmllink("", "", escapeHTML(
length $config{userdir} ? $config{userdir}."/".$user : $user
), 1);
} }
} #}}} } #}}}

3
debian/changelog vendored
View File

@ -3,8 +3,9 @@ ikiwiki (1.36) UNRELEASED; urgency=low
* Fix various links on the hyperestradier pages. * Fix various links on the hyperestradier pages.
* Use POST for poll to avoid some robots. * Use POST for poll to avoid some robots.
* Fix sometimes broken links to Discussion pages from blog pages. * Fix sometimes broken links to Discussion pages from blog pages.
* Add userdir config setting.
-- Joey Hess <joeyh@debian.org> Thu, 14 Dec 2006 14:41:01 -0500 -- Joey Hess <joeyh@debian.org> Tue, 19 Dec 2006 11:58:44 -0500
ikiwiki (1.35) unstable; urgency=low ikiwiki (1.35) unstable; urgency=low

2
doc/ikiwiki.setup
View File

@ -91,6 +91,8 @@ use IkiWiki::Setup::Standard {
# Logging settings: # Logging settings:
verbose => 0, verbose => 0,
syslog => 0, syslog => 0,
# To link to user pages in a subdirectory of the wiki.
#userdir => "users",
# To add plugins, list them here. # To add plugins, list them here.
#add_plugins => [qw{goodstuff openid search wikitext camelcase #add_plugins => [qw{goodstuff openid search wikitext camelcase

6
doc/usage.mdwn
View File

@ -228,6 +228,12 @@ configuration options of their own.
Enables or disables "Discussion" links from being added to the header of Enables or disables "Discussion" links from being added to the header of
every page. The links are enabled by default. every page. The links are enabled by default.
* --userdir subdir
Optionally, allows links to users of the wiki to link to pages inside a
subdirectory of the wiki. The default is to link to pages in the toplevel
directory of the wiki.
* --timeformat format * --timeformat format
Specify how to display the time or date. The format string is passed to the Specify how to display the time or date. The format string is passed to the