X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/253b1a41c1fec81e536840decfc9ea1645a41782..4af4d26582f0c2b915d7102fb4a604b176385748:/IkiWiki/Plugin/img.pm?ds=inline diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 845a4bf36..82db15a7e 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -26,6 +26,10 @@ sub preprocess (@) { my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint my %params=@_; + if (! defined $image) { + error("bad image filename"); + } + if (exists $imgdefaults{$params{page}}) { foreach my $key (keys %{$imgdefaults{$params{page}}}) { if (! exists $params{$key}) { @@ -156,13 +160,12 @@ sub preprocess (@) { (exists $params{alt} ? ' alt="'.$params{alt}.'"' : ''). (exists $params{title} ? ' title="'.$params{title}.'"' : ''). (exists $params{class} ? ' class="'.$params{class}.'"' : ''). + (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : ''). (exists $params{id} ? ' id="'.$params{id}.'"' : ''). ' />'; - my $alignclass=exists $params{align} ? "align-$params{align}" : ""; - my $link; - if (! defined $params{link} || lc($params{link}) eq 'yes') { + if (! defined $params{link}) { $link=$fileurl; } elsif ($params{link} =~ /^\w+:\/\//) { @@ -170,9 +173,7 @@ sub preprocess (@) { } if (defined $link) { - $imgtag=''.$imgtag.''; + $imgtag=''.$imgtag.''; } else { my $b = bestlink($params{page}, $params{link}); @@ -182,15 +183,13 @@ sub preprocess (@) { $imgtag=htmllink($params{page}, $params{destpage}, $params{link}, linktext => $imgtag, noimageinline => 1, - (!exists $params{caption} && $alignclass) ? - (class => $alignclass) : (), ); } } if (exists $params{caption}) { return '
'.$imgtag.' |