X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8c2c8c6bea57e4d9119500b866f6bd286533d4ea..459737780bcec043b530ccc74897c3e60dc2d967:/IkiWiki/Plugin/img.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b1c9db80c..14a32f635 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -62,7 +62,7 @@ sub preprocess (@) { #{{{
return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
$r = $im->Resize(geometry => "${w}x${h}");
- return "[[img ".sprinftf(gettext("failed to resize: %s"), $r)."]]" if $r;
+ return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
# don't actually write file in preview mode
if (! $params{preview}) {
@@ -96,9 +96,23 @@ sub preprocess (@) { #{{{
return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
}
- return '
';
+ '" height="'.$im->Get("height").'"'.
+ (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+ (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+ ' />';
+
+ if (! defined $params{link} || lc($params{link}) eq 'yes') {
+ return ''.$imgtag.'';
+ }
+ elsif (length bestlink($params{page}, $params{link})) {
+ return htmllink($params{page}, $params{destpage},
+ $params{link}, linktext => $imgtag);
+ }
+ else {
+ return $imgtag;
+ }
} #}}}
1