Commit d356cdeb authored by totten's avatar totten
Browse files

CRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters

parent 89595c92
...@@ -101,8 +101,8 @@ class CRM_Admin_Form_Setting extends CRM_Core_Form { ...@@ -101,8 +101,8 @@ class CRM_Admin_Form_Setting extends CRM_Core_Form {
); );
} }
$this->_defaults['enableSSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enableSSL', NULL, 0); $this->_defaults['enableSSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enableSSL');
$this->_defaults['verifySSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL', NULL, 1); $this->_defaults['verifySSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL');
} }
return $this->_defaults; return $this->_defaults;
......
...@@ -77,7 +77,7 @@ class CRM_Core_CommunityMessages { ...@@ -77,7 +77,7 @@ class CRM_Core_CommunityMessages {
$this->cache = $cache; $this->cache = $cache;
$this->client = $client; $this->client = $client;
if ($messagesUrl === NULL) { if ($messagesUrl === NULL) {
$this->messagesUrl = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'communityMessagesUrl', NULL, '*default*'); $this->messagesUrl = Civi::settings()->get('communityMessagesUrl');
} }
else { else {
$this->messagesUrl = $messagesUrl; $this->messagesUrl = $messagesUrl;
......
...@@ -451,11 +451,7 @@ abstract class CRM_Core_Payment { ...@@ -451,11 +451,7 @@ abstract class CRM_Core_Payment {
'maxlength' => 10, 'maxlength' => 10,
'autocomplete' => 'off', 'autocomplete' => 'off',
), ),
'is_required' => CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'is_required' => Civi::settings()->get('cvv_backoffice_required'),
'cvv_backoffice_required',
NULL,
1
),
'rules' => array( 'rules' => array(
array( array(
'rule_message' => ts('Please enter a valid value for your card security code. This is usually the last 3-4 digits on the card\'s signature panel.'), 'rule_message' => ts('Please enter a valid value for your card security code. This is usually the last 3-4 digits on the card\'s signature panel.'),
......
...@@ -89,7 +89,7 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp { ...@@ -89,7 +89,7 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
$result = parent::createStreamOpts($verb, $url, $blob, $headers); $result = parent::createStreamOpts($verb, $url, $blob, $headers);
$caConfig = CA_Config_Stream::probe(array( $caConfig = CA_Config_Stream::probe(array(
'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL', NULL, TRUE), 'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL'),
)); ));
if ($caConfig->isEnableSSL()) { if ($caConfig->isEnableSSL()) {
$result['ssl'] = $caConfig->toStreamOptions(); $result['ssl'] = $caConfig->toStreamOptions();
......
...@@ -1360,10 +1360,7 @@ GROUP BY mt.member_of_contact_id"; ...@@ -1360,10 +1360,7 @@ GROUP BY mt.member_of_contact_id";
* @return object * @return object
*/ */
public static function eventPriceSetDomainID() { public static function eventPriceSetDomainID() {
return CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MULTISITE_PREFERENCES_NAME, return Civi::settings()->get('event_price_set_domain_id');
'event_price_set_domain_id',
NULL, FALSE
);
} }
/** /**
......
...@@ -197,7 +197,7 @@ class CRM_Utils_HttpClient { ...@@ -197,7 +197,7 @@ class CRM_Utils_HttpClient {
*/ */
protected function createCurl($remoteFile) { protected function createCurl($remoteFile) {
$caConfig = CA_Config_Curl::probe(array( $caConfig = CA_Config_Curl::probe(array(
'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL', NULL, TRUE), 'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL'),
)); ));
$ch = curl_init(); $ch = curl_init();
......
...@@ -291,7 +291,7 @@ class CRM_Utils_VersionCheck { ...@@ -291,7 +291,7 @@ class CRM_Utils_VersionCheck {
'ufv' => $config->userFrameworkVersion, 'ufv' => $config->userFrameworkVersion,
'PHP' => phpversion(), 'PHP' => phpversion(),
'MySQL' => CRM_CORE_DAO::singleValueQuery('SELECT VERSION()'), 'MySQL' => CRM_CORE_DAO::singleValueQuery('SELECT VERSION()'),
'communityMessagesUrl' => CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'communityMessagesUrl', NULL, '*default*'), 'communityMessagesUrl' => Civi::settings()->get('communityMessagesUrl'),
); );
$this->getPayProcStats(); $this->getPayProcStats();
$this->getEntityStats(); $this->getEntityStats();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment