From 1ba7ecc35fc6a7058b2cdd236c1959567362c9da Mon Sep 17 00:00:00 2001 From: Jitendra Purohit Date: Mon, 20 Mar 2017 15:20:41 +0530 Subject: [PATCH] CRM-20246: maxfilesize on import should respect 0 as meaning 'no limit' --- CRM/Import/DataSource/CSV.php | 4 ++++ CRM/Import/Form/DataSource.php | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/CRM/Import/DataSource/CSV.php b/CRM/Import/DataSource/CSV.php index 37d5ae1ab958..c11b0aeb6a6a 100644 --- a/CRM/Import/DataSource/CSV.php +++ b/CRM/Import/DataSource/CSV.php @@ -66,6 +66,10 @@ public function buildQuickForm(&$form) { $config = CRM_Core_Config::singleton(); $uploadFileSize = CRM_Utils_Number::formatUnitSize($config->maxFileSize . 'm', TRUE); + //Fetch uploadFileSize from php_ini when $config->maxFileSize is set to "no limit". + if (empty($uploadFileSize)) { + $uploadFileSize = CRM_Utils_Number::formatUnitSize(ini_get('upload_max_filesize'), TRUE); + } $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $form->assign('uploadSize', $uploadSize); $form->add('File', 'uploadFile', ts('Import Data File'), 'size=30 maxlength=255', TRUE); diff --git a/CRM/Import/Form/DataSource.php b/CRM/Import/Form/DataSource.php index 7303052778cc..2270e6b74823 100644 --- a/CRM/Import/Form/DataSource.php +++ b/CRM/Import/Form/DataSource.php @@ -57,6 +57,11 @@ public function buildQuickForm() { $config = CRM_Core_Config::singleton(); $uploadFileSize = CRM_Utils_Number::formatUnitSize($config->maxFileSize . 'm', TRUE); + + //Fetch uploadFileSize from php_ini when $config->maxFileSize is set to "no limit". + if (empty($uploadFileSize)) { + $uploadFileSize = CRM_Utils_Number::formatUnitSize(ini_get('upload_max_filesize'), TRUE); + } $uploadSize = round(($uploadFileSize / (1024 * 1024)), 2); $this->assign('uploadSize', $uploadSize);