po: delete translations of deleted master pages

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 42de81bd16defdfbb4535cfd3c373e3bd1e52383..395890c0e1bcafdebc1ff4b84082026a634b42a0 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -9,11 +9,20 @@ use IkiWiki 2.00;
 
 my %imgdefaults;
 
 
 my %imgdefaults;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "img", call => \&getsetup);

        hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
        hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);

-} #}}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {

        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 


@@ -42,8 +51,8 @@ sub preprocess (@) { #{{{
 
        my $file = bestlink($params{page}, $image);
        my $srcfile = srcfile($file, 1);
 
        my $file = bestlink($params{page}, $image);
        my $srcfile = srcfile($file, 1);

-       if (! defined $srcfile) {
-               error(sprintf(gettext("%s not found"), $image));
+       if (! length $file || ! defined $srcfile) {
+               return htmllink($params{page}, $params{destpage}, $image);

        }
 
        my $dir = $params{page};
        }
 
        my $dir = $params{page};


@@ -56,9 +65,10 @@ sub preprocess (@) { #{{{
        my $r;
 
        if ($params{size} ne 'full') {
        my $r;
 
        if ($params{size} ne 'full') {

-               my ($w, $h) = ($params{size} =~ /^(\d+)x(\d+)$/);
+               my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);

                error sprintf(gettext('bad size "%s"'), $params{size})
                error sprintf(gettext('bad size "%s"'), $params{size})

-                       unless (defined $w && defined $h);
+                       unless (defined $w && defined $h &&
+                               (length $w || length $h));

 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";


@@ -139,6 +149,6 @@ sub preprocess (@) { #{{{
        else {
                return $imgtag;
        }
        else {
                return $imgtag;
        }

-} #}}}
+}

 
 1
 
 1