summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/lockedit.pm1
-rw-r--r--debian/changelog4
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