X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/58141a0ebcdf3313a83af712b83f8acd1c08aa3b..cf35ee04cddd7b9b39636499dd24b689443c0e97:/IkiWiki/Plugin/lockedit.pm

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 2b72fabe5..82ce1e7be 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::lockedit;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
@@ -20,9 +20,10 @@ sub canedit ($$) { #{{{
 	return undef if defined $user && IkiWiki::is_admin($user);
 
 	foreach my $admin (@{$config{adminuser}}) {
-		if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"), "")) {
+		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, 1),
+				htmllink("", "", $page, noimageinline => 1),
 				IkiWiki::userlink($admin));
 		}
 	}
@@ -40,7 +41,8 @@ sub formbuilder_setup (@) { #{{{
 
 	if ($form->title eq "preferences") {
 		$form->field(name => "locked_pages", size => 50,
-			comment => "(".htmllink("", "", "PageSpec", 1).")");
+			fieldset => "admin",
+			comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
 		if (! IkiWiki::is_admin($user_name)) {
 			$form->field(name => "locked_pages", type => "hidden");
 		}