lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-20 16:57:10 +02:00
commit 43edc64e7f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.formfile.class.php
View File

@ -127,11 +127,12 @@ class FormFile
if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
// Now $max and $maxphp are in Kb
if ($maxphp > 0) $max=min($max,$maxphp);
$maxmin = $max;
if ($maxphp > 0) $maxmin=min($max,$maxphp);
if ($max > 0)
if ($maxmin > 0)
{
$out .= '<input type="hidden" name="max_file_size" value="'.($max*1024).'">';
$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin*1024).'">';
}
$out .= '<input class="flat minwidth400" type="file"';