From fc19e2ac1bb6c855f02cec90e96d12f21b6c287a Mon Sep 17 00:00:00 2001 From: atif-shaikh Date: Thu, 1 Jan 2015 17:57:45 +0530 Subject: [PATCH] CRM-14199 Improvements - Incorrect Math in Import routines https://issues.civicrm.org/jira/browse/CRM-14199 --- CRM/Admin/Form/Setting/Miscellaneous.php | 7 ------- CRM/Core/Config/Defaults.php | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php index ed17f057b8..5572d50857 100644 --- a/CRM/Admin/Form/Setting/Miscellaneous.php +++ b/CRM/Admin/Form/Setting/Miscellaneous.php @@ -158,13 +158,6 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { $config = CRM_Core_Config::singleton(); $params = $this->controller->exportValues($this->_name); - // update upload max size in $config - // Fixme: why are we storing this php setting in $config? - $hiddenSettings = array( - 'maxImportFileSize' => CRM_Core_Config_Defaults::formatUnitSize(ini_get('upload_max_filesize')) - ); - CRM_Core_BAO_ConfigSetting::create($hiddenSettings); - // get current logging status $values = $this->exportValues(); diff --git a/CRM/Core/Config/Defaults.php b/CRM/Core/Config/Defaults.php index ffc8d04699..ccb1d5bff6 100644 --- a/CRM/Core/Config/Defaults.php +++ b/CRM/Core/Config/Defaults.php @@ -95,8 +95,8 @@ class CRM_Core_Config_Defaults { } if ($checkForPostMax) { - $config = CRM_Core_Config::singleton(); - if($config->maxImportFileSize > $size) { + $maxImportFileSize = self::formatUnitSize(ini_get('upload_max_filesize')); + if($maxImportFileSize > $size) { CRM_Core_Session::setStatus(ts("Note: Upload max filesize ('upload_max_filesize') should not exceed Post max size ('post_max_size') as defined in PHP.ini, please check with your system administrator."), ts("Warning"), "alert"); } } -- 2.25.1