From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 20 Sep 2008 20:31:27 +0000 (-0400)
Subject: avoid warning if percent value is not numeric
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/748d3759540b74a6faca5cad4f23b07527315f04

avoid warning if percent value is not numeric
---

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 2c015284e..e536f4e23 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -29,12 +29,11 @@ sub preprocess (@) { #{{{
 	if (defined $params{percent}) {
 		$fill = $params{percent};
 		($fill) = $fill =~ m/($percentage_pattern)/; # fill is untainted now
+		$fill=~s/%$//;
 		if (! defined $fill || ! length $fill || $fill > 100 || $fill < 0) {
 			error(sprintf(gettext("illegal percent value %s"), $params{percent}));
 		}
-		elsif ($fill !~ /%$/) {
-			$fill.="%";
-		}
+		$fill.="%";
 	}
 	elsif (defined $params{totalpages} and defined $params{donepages}) {
 		add_depends($params{page}, $params{totalpages});