projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-18414: On changing payment processor selection on Contribution page, disable...
[civicrm-core.git]
/
CRM
/
Core
/
Lock.php
diff --git
a/CRM/Core/Lock.php
b/CRM/Core/Lock.php
index 2f37b2dbad426ede0338cea791f1ce2126e7f574..9b4a418ac17f8b450b40eddce33d68bc3c0ff3c6 100644
(file)
--- a/
CRM/Core/Lock.php
+++ b/
CRM/Core/Lock.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
5
|
+ | Copyright CiviCRM LLC (c) 2004-201
6
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
5
+ * @copyright CiviCRM LLC (c) 2004-201
6
* $Id$
*
*/
* $Id$
*
*/
@@
-89,10
+89,7
@@
class CRM_Core_Lock implements \Civi\Core\Lock\LockInterface {
* @deprecated
*/
public static function createCivimailLock($name) {
* @deprecated
*/
public static function createCivimailLock($name) {
- $serverWideLock = \CRM_Core_BAO_Setting::getItem(
- \CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME,
- 'civimail_server_wide_lock'
- );
+ $serverWideLock = \Civi::settings()->get('civimail_server_wide_lock');
return new static($name, NULL, $serverWideLock);
}
return new static($name, NULL, $serverWideLock);
}