* Fix aggregator to not warn when a feed contains no body content at all.

[ikiwiki.git] / IkiWiki / Plugin / lockedit.pm

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 587f7ee540b573d84ceb21ab88fc1ae8c28f7005..f204e72c0052df303469c5970a4046c6ba96bd7f 100644 (file)
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -20,9 +20,9 @@ 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"), "")) {
                        return sprintf(gettext("%s is locked by %s and cannot be edited"),
-                               htmllink("", "", $page, 1),
+                               htmllink("", "", $page, noimageinline => 1),
                                IkiWiki::userlink($admin));
                }
        }
@@ -40,7 +40,7 @@ sub formbuilder_setup (@) { #{{{
 
        if ($form->title eq "preferences") {
                $form->field(name => "locked_pages", size => 50,
-                       comment => "(".htmllink("", "", "PageSpec", 1).")");
+                       comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
                if (! IkiWiki::is_admin($user_name)) {
                        $form->field(name => "locked_pages", type => "hidden");
                }