* If a userdir is configured, links to pages in it can be made without

specifying the path. This allows for easy signing of comments by linking
  to your page in the userdir.
master
joey 2006-12-29 05:33:20 +00:00
parent 7819f34a50
commit f62d23f008
10 changed files with 22 additions and 1 deletions

View File

@ -319,6 +319,10 @@ sub bestlink ($$) { #{{{
} }
} while $cwd=~s!/?[^/]+$!!; } while $cwd=~s!/?[^/]+$!!;
if (length $config{userdir} && exists $links{"$config{userdir}/".lc($link)}) {
return $links{"$config{userdir}/".lc($link)};
}
#print STDERR "warning: page $page, broken link: $link\n"; #print STDERR "warning: page $page, broken link: $link\n";
return ""; return "";
} #}}} } #}}}

View File

@ -419,6 +419,8 @@ sub cgi_editpage ($$) { #{{{
push @page_locs, $dir.$page; push @page_locs, $dir.$page;
} }
} }
push @page_locs, "$config{userdir}/$page"
if length $config{userdir};
@page_locs = grep { @page_locs = grep {
! exists $pagecase{lc $_} && ! exists $pagecase{lc $_} &&

View File

@ -25,3 +25,8 @@ to link to, when there are multiple pages with similar names and the link
goes to the wrong page by default. For example, linking from goes to the wrong page by default. For example, linking from
"FooBar/SubPage" to "/OtherPage" will link to the "OtherPage" in the root "FooBar/SubPage" to "/OtherPage" will link to the "OtherPage" in the root
of the wiki, even if there is a "FooBar/OtherPage". of the wiki, even if there is a "FooBar/OtherPage".
Also, if the wiki is configured with a userdir, you can link to pages
within the userdir without specifying a path to them. This is to allow for
easy linking to a user's page in the userdir, to sign a comment. These
links are checked for last of all.

5
debian/changelog vendored
View File

@ -20,8 +20,11 @@ ikiwiki (1.37) UNRELEASED; urgency=low
* Don't put discussion links on discussion pages. * Don't put discussion links on discussion pages.
* Allow disabling of plugins included in goodstuff. * Allow disabling of plugins included in goodstuff.
* Add a textile format plugin contributed by mazirian. * Add a textile format plugin contributed by mazirian.
* If a userdir is configured, links to pages in it can be made without
specifying the path. This allows for easy signing of comments by linking
to your page in the userdir.
-- Joey Hess <joeyh@debian.org> Fri, 29 Dec 2006 00:17:58 -0500 -- Joey Hess <joeyh@debian.org> Fri, 29 Dec 2006 00:26:47 -0500
ikiwiki (1.36) unstable; urgency=low ikiwiki (1.36) unstable; urgency=low

View File

@ -1,3 +1,5 @@
The userdir should be searched at the end of the search "path" for links, The userdir should be searched at the end of the search "path" for links,
so that users can put their pages in the userdir, and still link to them so that users can put their pages in the userdir, and still link to them
easily when signing things, without giving a path. easily when signing things, without giving a path.
[[todo/done]]

5
doc/users.mdwn 100644
View File

@ -0,0 +1,5 @@
See [[IkiwikiUsers]] for the list of sites using ikiwiki.
Users of this wiki, feel free to create a subpage of this one and talk
about yourself on it, within reason. You can link to it to sign your
comments.