X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FLock.php;h=9b4a418ac17f8b450b40eddce33d68bc3c0ff3c6;hb=c0fbe80fc23abafadba070cf8b80f8c3260362d0;hp=2f37b2dbad426ede0338cea791f1ce2126e7f574;hpb=25d95f38e877adc852b7fee2e27b59f96ab654a8;p=civicrm-core.git

diff --git a/CRM/Core/Lock.php b/CRM/Core/Lock.php
index 2f37b2dbad..9b4a418ac1 100644
--- a/CRM/Core/Lock.php
+++ b/CRM/Core/Lock.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
  * $Id$
  *
  */
@@ -89,10 +89,7 @@ class CRM_Core_Lock implements \Civi\Core\Lock\LockInterface {
    * @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);
   }