lockedit: Detect if no authentication plugins are enabled, and die with an error...

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 223b5a11f3e1250ae3dca43551f4601f47508894..32023fa97af8ba8e63192cacaff10a4677d20654 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -44,6 +44,7 @@ sub preprocess (@) {
        }
 
        add_link($params{page}, $image);
        }
 
        add_link($params{page}, $image);

+       add_depends($params{page}, $image);

 
        # optimisation: detect scan mode, and avoid generating the image
        if (! defined wantarray) {
 
        # optimisation: detect scan mode, and avoid generating the image
        if (! defined wantarray) {


@@ -69,8 +70,6 @@ sub preprocess (@) {
        my ($dwidth, $dheight);
 
        if ($params{size} ne 'full') {
        my ($dwidth, $dheight);
 
        if ($params{size} ne 'full') {

-               add_depends($params{page}, $image);
-

                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
                error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
                        unless (defined $w && defined $h &&
                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
                error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
                        unless (defined $w && defined $h &&


@@ -171,7 +170,7 @@ sub preprocess (@) {
                my $b = bestlink($params{page}, $params{link});
        
                if (length $b) {
                my $b = bestlink($params{page}, $params{link});
        
                if (length $b) {

-                       add_depends($params{page}, $b);
+                       add_depends($params{page}, $b, deptype("presence"));

                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
                                noimageinline => 1);
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
                                noimageinline => 1);