urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

master
Joey Hess 2008-07-01 20:35:54 -04:00
parent 883da338a4
commit ed25c2abf2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/attachment.pm
View File

@ -22,7 +22,7 @@ sub formbuilder_setup (@) { #{{{
if ($form->field("do") eq "edit") { if ($form->field("do") eq "edit") {
$form->field(name => 'attachment', type => 'file'); $form->field(name => 'attachment', type => 'file');
# These buttons are not put in the usual place, so # These buttons are not put in the usual place, so
# is not added to the normal formbuilder button list. # are not added to the normal formbuilder button list.
$form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />'); $form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
$form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />'); $form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
} }
@ -220,7 +220,7 @@ sub parsesize ($) { #{{{
my $base=$size+0; # force to number my $base=$size+0; # force to number
use warnings; use warnings;
foreach my $unit (sort keys %units) { foreach my $unit (sort keys %units) {
if ($size=~/\d\Q$unit\E$/i) { if ($size=~/[0-9\s]\Q$unit\E$/i) {
return $base * $units{$unit}; return $base * $units{$unit};
} }
} }
@ -232,7 +232,7 @@ sub humansize ($) { #{{{
foreach my $unit (reverse sort { $units{$a} <=> $units{$b} || $b cmp $a } keys %units) { foreach my $unit (reverse sort { $units{$a} <=> $units{$b} || $b cmp $a } keys %units) {
if ($size / $units{$unit} > 0.25) { if ($size / $units{$unit} > 0.25) {
return (int($size / $units{$unit} * 10)/10)."$unit"; return (int($size / $units{$unit} * 10)/10).$unit;
} }
} }
return $size; # near zero, or negative return $size; # near zero, or negative