aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-11-17 18:44:27 -0400
committerJoey Hess <joey@kitenet.net>2011-11-17 18:44:27 -0400
commit344a50f5b9594d34eb70bea64c85e46e01765546 (patch)
treee98fab8c9c14dc44ba193615b395456c394ce7a8 /IkiWiki
parenta066e0405e22ed846cb21ec26b8ee972413a79e1 (diff)
parent937c0742322065452a204069e0ba5abc625ec0c6 (diff)
downloadikiwiki-344a50f5b9594d34eb70bea64c85e46e01765546.tar
ikiwiki-344a50f5b9594d34eb70bea64c85e46e01765546.tar.gz
Merge remote-tracking branch 'remotes/pelle/patch/img_size'
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/img.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b98e843d4..a28d6a6d5 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -132,9 +132,9 @@ sub preprocess (@) {
$imglink = $file;
}
}
-
- $dwidth = $im->Get("width") unless defined $dwidth;
- $dheight = $im->Get("height") unless defined $dheight;
+ # always get the true size of the resized image
+ $dwidth = $im->Get("width");
+ $dheight = $im->Get("height");
}
}
else {