Merge commit 'origin/master'

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 748d28aceae70a3494b8a9f587c0f2de0595db6c..7b89ab6730faed3693f2d0eb59afa38a5194e854 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -10,9 +10,18 @@ use IkiWiki 2.00;
 my %imgdefaults;
 
 sub import { #{{{
 my %imgdefaults;
 
 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 getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

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


@@ -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";