CRM_Core_BAO_ConfigSetting::formatParams - Remove silly function

This function is basically just array_merge().

In theory, there's a side-effect where NULL values in `$values` are unset,
but neither use-case seems to make any use of `$values` afterward, and that
smells like an accidental side-effect anyway.

diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php
index f0a4174d638f8e59029d1d953221d28a5fa6ef0d..e7569919edb86b54ce2fcafcb12f16ba7aab13c9 100644 (file)
--- a/CRM/Admin/Form/Setting/Smtp.php
+++ b/CRM/Admin/Form/Setting/Smtp.php
@@ -181,7 +181,7 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting {
     );
 
     if (!empty($mailingBackend)) {
-      CRM_Core_BAO_ConfigSetting::formatParams($formValues, $mailingBackend);
+      $formValues = array_merge($mailingBackend, $formValues);
     }
 
     // if password is present, encrypt it

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 9d6813bcf65e4980eeb2c3e306edfb0dbd07af1b..b632a72a2398d731f8caed395b368932976f5083 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -65,8 +65,7 @@ class CRM_Core_BAO_ConfigSetting {
     $domain->id = CRM_Core_Config::domainID();
     $domain->find(TRUE);
     if ($domain->config_backend) {
-      $values = unserialize($domain->config_backend);
-      self::formatParams($params, $values);
+      $params = array_merge(unserialize($domain->config_backend), $params);
     }
 
     // unset any of the variables we read from file that should not be stored in the database
@@ -139,30 +138,6 @@ class CRM_Core_BAO_ConfigSetting {
     }
   }
 
-  /**
-   * Format the array containing before inserting in db.
-   *
-   * @param array $params
-   *   Associated array of civicrm variables(submitted).
-   * @param array $values
-   *   Associated array of civicrm variables stored in db.
-   */
-  public static function formatParams(&$params, &$values) {
-    if (empty($params) ||
-      !is_array($params)
-    ) {
-      $params = $values;
-    }
-    else {
-      foreach ($params as $key => $val) {
-        if (array_key_exists($key, $values)) {
-          unset($values[$key]);
-        }
-      }
-      $params = array_merge($params, $values);
-    }
-  }
-
   /**
    * Retrieve the settings values from db.
    *