CRM-14199 Improvements - Incorrect Math in Import routines

https://issues.civicrm.org/jira/browse/CRM-14199

diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php
index ed17f057b87e7d044b9b21fede5c4a30c9fa0615..5572d50857f533a862aa41020de65976e1086031 100644 (file)
--- 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 ffc8d046992ae7628efe44b2d0f1909de660da51..ccb1d5bff67260becc0e7b192b6273169ba03950 100644 (file)
--- 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");
         }
       }