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

  in.

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 742fd41f65d0cabf963be99e187e0203dbb8c200..82ce1e7be75e2a7a6e0ae70e8a83c776e5068da0 100644 (file)
--- 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 09ccb42aabb0ec61e12474a62aea291d40b9a9dc..25d36abc54781e61591d692b5f48c570b10ae732 100644 (file)
--- 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