]> sipb.mit.edu Git - ikiwiki.git/commitdiff
avoid warning if percent value is not numeric
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 20 Sep 2008 20:31:27 +0000 (16:31 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 20 Sep 2008 20:31:27 +0000 (16:31 -0400)
IkiWiki/Plugin/progress.pm

index 2c015284e6fd4188f704c1bfceaaf7247c271443..e536f4e23370773aebd296e290d0c84b2ded83ae 100644 (file)
@@ -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});