fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in qronald/processmaker/HOR-917 (pull request #4193)

Browse Source 
HOR-917
This commit is contained in:
Julio Cesar Laura Avendaño
2016-05-04 16:09:10 -04:00
parent 7832389d11 0204a4f0f2
commit 03fde1efed
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -1308,7 +1308,12 @@ class Light
} }
$response['listLanguage'] = $languagesList; $response['listLanguage'] = $languagesList;
if (isset($params['fileLimit']) && $params['fileLimit']) { if (isset($params['fileLimit']) && $params['fileLimit']) {
$response['fileLimit'] = $this->return_bytes(ini_get('post_max_size')); $postMaxSize = $this->return_bytes(ini_get('post_max_size'));
$uploadMaxFileSize = $this->return_bytes(ini_get('upload_max_filesize'));
if ($postMaxSize < $uploadMaxFileSize){
$uploadMaxFileSize = $postMaxSize;
}
$response['fileLimit'] = $uploadMaxFileSize;
} }
if (isset($params['tz']) && $params['tz']) { if (isset($params['tz']) && $params['tz']) {
$response['tz'] = isset($_SESSION['USR_TIME_ZONE'])?$_SESSION['USR_TIME_ZONE']:$sysConf['time_zone']; $response['tz'] = isset($_SESSION['USR_TIME_ZONE'])?$_SESSION['USR_TIME_ZONE']:$sysConf['time_zone'];