Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
img.pm
diff --git
a/IkiWiki/Plugin/img.pm
b/IkiWiki/Plugin/img.pm
index 48211454e93c1a65a5114241baccc207b1ac977b..eb1b6812482dab4065f40dbe6b8a4ebc96726a49 100644
(file)
--- a/
IkiWiki/Plugin/img.pm
+++ b/
IkiWiki/Plugin/img.pm
@@
-39,7
+39,7
@@
sub preprocess (@) {
}
}
}
}
- if (! exists $params{size}) {
+ if (! exists $params{size}
|| ! length $params{size}
) {
$params{size}='full';
}
$params{size}='full';
}
@@
-156,14
+156,18
@@
sub preprocess (@) {
$imgurl="$config{url}/$imglink";
}
$imgurl="$config{url}/$imglink";
}
+ my $attrs='';
+ foreach my $attr (qw{alt title class id hspace vspace}) {
+ if (exists $params{$attr}) {
+ $attrs.=" $attr=\"$params{$attr}\"";
+ }
+ }
+
my $imgtag='<img src="'.$imgurl.
'" width="'.$dwidth.
'" height="'.$dheight.'"'.
my $imgtag='<img src="'.$imgurl.
'" width="'.$dwidth.
'" height="'.$dheight.'"'.
- (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
- (exists $params{title} ? ' title="'.$params{title}.'"' : '').
- (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+ $attrs.
(exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
(exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
- (exists $params{id} ? ' id="'.$params{id}.'"' : '').
' />';
my $link;
' />';
my $link;