diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-07 05:34:55 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-07 05:34:55 +0000 |
| commit | 5132558731e14f298ecd20edb37b16be5bfb2d44 (patch) | |
| tree | 07aaf60f24081db48555649dec120ec71e86b3d1 | |
| parent | 2c0d0109d8593dc20c1493e492d15ed225fae563 (diff) | |
* Improve handling of edits of locked pages by users who are not yet signed
in.
| -rw-r--r-- | IkiWiki/Plugin/lockedit.pm | 1 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 742fd41f6..82ce1e7be 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -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)); diff --git a/debian/changelog b/debian/changelog index 09ccb42aa..25d36abc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |