From 56cb3188ebc6303e5c5113673a7c3c7ccd649c73 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Tue, 28 May 2013 09:27:32 -0700 Subject: [PATCH] fix formatting and tabs --- CRM/Core/BAO/Setting.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php index 0161abe92e..47d9614036 100644 --- a/CRM/Core/BAO/Setting.php +++ b/CRM/Core/BAO/Setting.php @@ -90,7 +90,8 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { $cacheKey = "CRM_Setting_{$group}_{$componentID}_{$contactID}_{$domainID}"; - if ($load && + if ( + $load && ($force || !isset(self::$_cache[$cacheKey])) ) { @@ -178,7 +179,8 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { * @static * @access public */ - static function getItem($group, + static function getItem( + $group, $name = NULL, $componentID = NULL, $defaultValue = NULL, @@ -385,14 +387,14 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { foreach ($fieldsToSet as $name => $value) { if(empty($fields['values'][$name]['config_only'])){ CRM_Core_BAO_Setting::setItem( - $value, - $fields['values'][$name]['group_name'], - $name, - CRM_Utils_Array::value('component_id', $params), - CRM_Utils_Array::value('contact_id', $params), - CRM_Utils_Array::value('created_id', $params), - $domainID - ); + $value, + $fields['values'][$name]['group_name'], + $name, + CRM_Utils_Array::value('component_id', $params), + CRM_Utils_Array::value('contact_id', $params), + CRM_Utils_Array::value('created_id', $params), + $domainID + ); } if(!empty($fields['values'][$name]['prefetch'])){ if(!empty($fields['values'][$name]['config_key'])){ -- 2.25.1