From 5d53fab853def09bcc2c7455cabdbc9a002746e2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 9 Sep 2008 15:20:06 -0400
Subject: img: Support sizes like 200x. Closes: #475149

---
 IkiWiki/Plugin/img.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 66cc08530..7b89ab673 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -65,9 +65,10 @@ sub preprocess (@) { #{{{
 	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})
-			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";
-- 
cgit v1.2.3