Merge pull request #3179 from webpartners/master

[civicrm-core.git] / api / v3 / CaseType.php

diff --git a/api/v3/CaseType.php b/api/v3/CaseType.php
index 75f0c626f165b295195dd69a3104662f9e563649..d046c5a20cf4f5245a8f979c591cec84dd4bea26 100644 (file)
--- a/api/v3/CaseType.php
+++ b/api/v3/CaseType.php
@@ -50,7 +50,7 @@
  * @access public
  */
 function civicrm_api3_case_type_create($params) {
-  civicrm_api3_verify_mandatory($params, _civicrm_api3_get_DAO(__FUNCTION__), array('name'));
+  civicrm_api3_verify_mandatory($params, _civicrm_api3_get_DAO(__FUNCTION__));
 
   if (!array_key_exists('is_active', $params) && empty($params['id'])) {
     $params['is_active'] = TRUE;
@@ -83,8 +83,12 @@ function civicrm_api3_case_type_get($params) {
  */
 function _civicrm_api3_case_type_get_formatResult(&$result) {
   foreach ($result['values'] as $key => $caseType) {
-    $definition = CRM_Case_BAO_CaseType::getCaseTypeDefinition($caseType);
-    $result['values'][$key]['definition'] = $definition;
+    $xml = CRM_Case_XMLRepository::singleton()->retrieve($caseType['name']);
+    if ($xml) {
+      $result['values'][$key]['definition'] = CRM_Case_BAO_CaseType::convertXmlToDefinition($xml);
+    } else {
+      $result['values'][$key]['definition'] = array();
+    }
   }
   return $result;
 }