*
* @param int $recurId
* Recur contribution id.
- * @param array $objects
- * An array of objects that is to be cancelled like.
- * contribution, membership, event. At least contribution object is a must.
*
* @param array $activityParams
*
* @return bool
*/
- public static function cancelRecurContribution($recurId, $objects, $activityParams = array()) {
+ public static function cancelRecurContribution($recurId, $activityParams = array()) {
if (!$recurId) {
return FALSE;
}
CRM_Activity_BAO_Activity::create($activityParams);
}
- // if there are associated objects, cancel them as well
- if (!$objects) {
- $transaction->commit();
- return TRUE;
- }
- else {
- // @todo - this is bad! Get the function out of the ipn.
- $baseIPN = new CRM_Core_Payment_BaseIPN();
- return $baseIPN->cancelled($objects, $transaction);
- }
+ $transaction->commit();
+ return TRUE;
}
else {
// if already cancelled, return true
$cid = CRM_Utils_Request::retrieve('cid', 'Integer');
$mid = CRM_Utils_Request::retrieve('mid', 'Integer');
$qfkey = CRM_Utils_Request::retrieve('key', 'String');
- $context = CRM_Utils_Request::retrieve('context', 'String');
+ $context = CRM_Utils_Request::retrieve('context', 'Alphanumeric');
if ($cid) {
switch ($context) {
case 'contribution':