From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 30 Dec 2014 15:12:36 +0000 (-0500)
Subject: CRM-15766 - Fix settings form wrongly adding everything to config
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0715cdf273289977d9642b064957a333e75a33a9;p=civicrm-core.git

CRM-15766 - Fix settings form wrongly adding everything to config
---

diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php
index d96f9a63cb..cf0bea74ee 100644
--- a/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -158,9 +158,12 @@ 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 DB
-    $params['maxImportFileSize'] = CRM_Core_Config_Defaults::formatUnitSize(ini_get('upload_max_filesize'));
-    CRM_Core_BAO_ConfigSetting::create($params);
+    // 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();