* Improve handling of edits of locked pages by users who are not yet signed

in.
master
joey 2007-05-07 05:34:55 +00:00
parent 2c0d0109d8
commit 5132558731
2 changed files with 4 additions and 1 deletions

View File

@ -21,6 +21,7 @@ sub canedit ($$) { #{{{
foreach my $admin (@{$config{adminuser}}) {
if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) {
IkiWiki::needsignin($cgi, $session) unless defined $user;
return sprintf(gettext("%s is locked by %s and cannot be edited"),
htmllink("", "", $page, noimageinline => 1),
IkiWiki::userlink($admin));

4
debian/changelog vendored
View File

@ -5,8 +5,10 @@ ikiwiki (2.1) UNRELEASED; urgency=low
templates.
* Make the openid login form nicely styled.
* Fix a bug that prevented clearing email or subscriptions.
* Improve handling of edits of locked pages by users who are not yet signed
in.
-- Joey Hess <joeyh@debian.org> Mon, 30 Apr 2007 18:04:02 -0400
-- Joey Hess <joeyh@debian.org> Mon, 07 May 2007 02:02:53 -0400
ikiwiki (2.00) unstable; urgency=low