--CRM-16188, added changes as per Eileen's comment

diff --git a/api/v3/Order.php b/api/v3/Order.php
index 126748de39e109672c33b827c90066967dc2d6f5..ff98dec4cc3712678e2490af5b2c6fc87bafc204 100644 (file)
--- a/api/v3/Order.php
+++ b/api/v3/Order.php
@@ -149,7 +149,7 @@ function civicrm_api3_order_delete($params) {
 }
 
 /**
- * Cancel a Order.
+ * Cancel an Order.
  *
  * @param array $params
  *   Input parameters.
@@ -158,12 +158,10 @@ function civicrm_api3_order_delete($params) {
  */
 function civicrm_api3_order_cancel($params) {
   $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
-  $params['contribution_status_id'] = array_search('Cancelled', $contributionStatuses);
+  $params['contribution_status_id'] = 'Cancelled';
   $result = civicrm_api3('Contribution', 'create', $params);
-  if (!CRM_Utils_Array::value('is_error', $result)) {
-    CRM_Contribute_BAO_Contribution::transitionComponents($params);
-  }
-  return civicrm_api3_create_success(CRM_Utils_Array::value('values', $result), $params, 'Order', 'cancel');
+  CRM_Contribute_BAO_Contribution::transitionComponents($params);
+  return civicrm_api3_create_success($result['values'], $params, 'Order', 'cancel');
 }
 
 /**