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 'phpunit-ob-fix' of https://github.com/giant-rabbit/civicrm-core into...
[civicrm-core.git]
/
CRM
/
Core
/
Payment
/
GoogleIPN.php
diff --git
a/CRM/Core/Payment/GoogleIPN.php
b/CRM/Core/Payment/GoogleIPN.php
index 4dd6ed4241d3ce9f5fe951d0eff7ef1dd64757eb..c0679d1874179960a686ddeddc8394f9b9a4b315 100644
(file)
--- a/
CRM/Core/Payment/GoogleIPN.php
+++ b/
CRM/Core/Payment/GoogleIPN.php
@@
-51,14
+51,14
@@
class CRM_Core_Payment_GoogleIPN extends CRM_Core_Payment_BaseIPN {
static private $_singleton = NULL;
/**
static private $_singleton = NULL;
/**
- *
m
ode of operation: live or test
+ *
M
ode of operation: live or test
*
* @var object
*/
protected $_mode = NULL;
/**
*
* @var object
*/
protected $_mode = NULL;
/**
- * @param $name
+ * @param
string
$name
* @param $type
* @param $object
* @param bool $abort
* @param $type
* @param $object
* @param bool $abort
@@
-234,7
+234,6
@@
class CRM_Core_Payment_GoogleIPN extends CRM_Core_Payment_BaseIPN {
}
}
}
}
- // CRM_Core_Error::debug_var( 'c', $contribution );
$contribution->save();
$transaction->commit();
$contribution->save();
$transaction->commit();
@@
-317,7
+316,6
@@
class CRM_Core_Payment_GoogleIPN extends CRM_Core_Payment_BaseIPN {
$transaction = new CRM_Core_Transaction();
$transaction = new CRM_Core_Transaction();
- // CRM_Core_Error::debug_var( 'c', $contribution );
if ($status == 'PAYMENT_DECLINED' ||
$status == 'CANCELLED_BY_GOOGLE' ||
$status == 'CANCELLED'
if ($status == 'PAYMENT_DECLINED' ||
$status == 'CANCELLED_BY_GOOGLE' ||
$status == 'CANCELLED'
@@
-394,7
+392,7
@@
WHERE contribution_recur_id = {$ids['contributionRecur']}
}
/**
}
/**
- *
s
ingleton function used to manage this object
+ *
S
ingleton function used to manage this object
*
* @param string $mode the mode of operation: live or test
*
*
* @param string $mode the mode of operation: live or test
*