projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4.6' of https://github.com/civicrm/civicrm-core
[civicrm-core.git]
/
bin
/
ContributionProcessor.php
diff --git
a/bin/ContributionProcessor.php
b/bin/ContributionProcessor.php
index bf8096f964cafe5d9ab0bfe2480fe47d7bc8039d..ae976e7e9af10dbbf008299519dffd4c99933524 100644
(file)
--- a/
bin/ContributionProcessor.php
+++ b/
bin/ContributionProcessor.php
@@
-29,8
+29,6
@@
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2015
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
*/
class CiviContributeProcessor {
static $_paypalParamsMapper = array(
*/
class CiviContributeProcessor {
static $_paypalParamsMapper = array(
@@
-699,7
+697,7
@@
CRM_Utils_System::authenticateScript(TRUE);
//log the execution of script
CRM_Core_Error::debug_log_message('ContributionProcessor.php');
//log the execution of script
CRM_Core_Error::debug_log_message('ContributionProcessor.php');
-$lock = Civi
\Core\Container::singleton()->get('lockManager'
)->acquire('worker.contribute.CiviContributeProcessor');
+$lock = Civi
::lockManager(
)->acquire('worker.contribute.CiviContributeProcessor');
if ($lock->isAcquired()) {
// try to unset any time limits
if ($lock->isAcquired()) {
// try to unset any time limits