diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
| commit | 1f7f5d5e0e21920c5f15290cd34594ad91077071 (patch) | |
| tree | a19302c57ed6ea46c4bf05a1ed8d840725643069 /IkiWiki/Plugin/lockedit.pm | |
| parent | 917f54a777d152ee5963acd81bf8a2800a0507b1 (diff) | |
| parent | 20e691fe20ead76d826ab77501c6e9cbc7b487e8 (diff) | |
Merge branch 'master' into darcs
Diffstat (limited to 'IkiWiki/Plugin/lockedit.pm')
| -rw-r--r-- | IkiWiki/Plugin/lockedit.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 7462de41c..f6cac6cdd 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -37,7 +37,10 @@ sub canedit ($$) { #{{{ return undef if defined $user && IkiWiki::is_admin($user); if (defined $config{locked_pages} && length $config{locked_pages} && - pagespec_match($page, $config{locked_pages})) { + pagespec_match($page, $config{locked_pages}, + user => $session->param("name"), + ip => $ENV{REMOTE_ADDR}, + )) { if (! defined $user || ! IkiWiki::userinfo_get($session->param("name"), "regdate")) { return sub { IkiWiki::needsignin($cgi, $session) }; @@ -51,7 +54,10 @@ sub canedit ($$) { #{{{ # XXX deprecated, should be removed eventually 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"), + user => $session->param("name"), + ip => $ENV{REMOTE_ADDR}, + )) { if (! defined $user || ! IkiWiki::userinfo_get($session->param("name"), "regdate")) { return sub { IkiWiki::needsignin($cgi, $session) }; |