* Add userdir config setting.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 45a3627cc8301c54d7723d71526b12457ee1255e..4869b3ef3b32fee7a0ed2ab4cda7221461302b1e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -67,6 +67,7 @@ sub defaultconfig () { #{{{
        locale => undef,
        sslcookie => 0,
        httpauth => 0,
+       userdir => "",
 } #}}}
    
 sub checkconfig () { #{{{

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d00de740a1c11554b890009c887fcbd3b7719cac..9b5ee6c19b980d491773b027afb6bc4d9a8cd95f 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -666,7 +666,9 @@ sub userlink ($) { #{{{
                return "<a href=\"$user\">".escapeHTML($display)."</a>";
        }
        else {
-               return htmllink("", "", escapeHTML($user), 1);
+               return htmllink("", "", escapeHTML(
+                       length $config{userdir} ? $config{userdir}."/".$user : $user
+               ), 1);
        }
 } #}}}
 

diff --git a/debian/changelog b/debian/changelog
index e37def28c06800ba3cad1fd651bb0b13db464d19..fda813c870ba4f46613b0a0679f007e223d0d9b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ikiwiki (1.36) UNRELEASED; urgency=low
   * Fix various links on the hyperestradier pages.
   * Use POST for poll to avoid some robots.
   * 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
 

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index f7bf81bc91375a0088683f3d6dee314298971f3b..d23010fd58bc9b92163d5bad4af0be3bb956ce9f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -91,6 +91,8 @@ use IkiWiki::Setup::Standard {
        # Logging settings:
        verbose => 0,
        syslog => 0,
+       # To link to user pages in a subdirectory of the wiki.
+       #userdir => "users",
        
        # To add plugins, list them here.
        #add_plugins => [qw{goodstuff openid search wikitext camelcase

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 9e260adc29ceeec7a06a8ce957b1bb2c506e598b..ce60d91a4f7790cd5385666d2a527bb70bd62d3c 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -228,6 +228,12 @@ configuration options of their own.
   Enables or disables "Discussion" links from being added to the header of
   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
 
   Specify how to display the time or date. The format string is passed to the