AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull-request #2890

This commit is contained in:
Frederic Guillot 2016-12-13 20:22:38 -05:00
parent 5964d5cb13 2ed00b69a0
commit b6ea1ac9a4
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/ProjectFileController.php
View File

@ -21,7 +21,7 @@ class ProjectFileController extends BaseController
$this->response->html($this->template->render('project_file/create', array(
'project' => $project,
'max_size' => $this->helper->text->phpToBytes(ini_get('upload_max_filesize')),
'max_size' => $this->helper->text->phpToBytes(get_upload_max_size()),
)));
}

2
app/Controller/TaskFileController.php
View File

@ -40,7 +40,7 @@ class TaskFileController extends BaseController
$this->response->html($this->template->render('task_file/create', array(
'task' => $task,
'max_size' => $this->helper->text->phpToBytes(ini_get('upload_max_filesize')),
'max_size' => $this->helper->text->phpToBytes(get_upload_max_size()),
)));
}

2
app/Controller/TaskImportController.php
View File

@ -27,7 +27,7 @@ class TaskImportController extends BaseController
'project' => $project,
'values' => $values,
'errors' => $errors,
'max_size' => ini_get('upload_max_filesize'),
'max_size' => get_upload_max_size(),
'delimiters' => Csv::getDelimiters(),
'enclosures' => Csv::getEnclosures(),
'title' => t('Import tasks from CSV file'),

2
app/Controller/UserImportController.php
View File

@ -23,7 +23,7 @@ class UserImportController extends BaseController
$this->response->html($this->template->render('user_import/show', array(
'values' => $values,
'errors' => $errors,
'max_size' => ini_get('upload_max_filesize'),
'max_size' => get_upload_max_size(),
'delimiters' => Csv::getDelimiters(),
'enclosures' => Csv::getEnclosures(),
)));

10
app/functions.php
View File

@ -135,6 +135,16 @@ function build_app_version($ref, $commit_hash)
return $version;
}
/**
* Get upload max size.
*
* @return string
*/
function get_upload_max_size()
{
return min(ini_get('upload_max_filesize'), ini_get('post_max_size'));
}
/**
* Translate a string
*