fix code to work with api and UI, CRM-14474

----------------------------------------
* CRM-14474: Update CiviCase XML processor to load from DB *or* file
  https://issues.civicrm.org/jira/browse/CRM-14474

diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php
index b845c9cd20e74b45726131d102af448502e6dc34..2723b812f56b8f2eb610aa73acee1d2b53a3db00 100644 (file)
--- a/CRM/Case/BAO/CaseType.php
+++ b/CRM/Case/BAO/CaseType.php
@@ -157,13 +157,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType {
    * @static
    */
   static function getCaseTypeDefinition($caseType) {
-    // check if case type definition is saved in DB
-    if (!empty($caseType['definition'])) {
-      $xml = simplexml_load_string($caseType['definition']);
-    }
-    else {
-      $xml = CRM_Case_XMLRepository::singleton()->retrieve($caseType['name']);
-    }
+    $xml = CRM_Case_XMLRepository::singleton()->retrieve($caseType['name']);
 
     // build PHP array based on definition
     $definition = array();

diff --git a/CRM/Case/XMLRepository.php b/CRM/Case/XMLRepository.php
index b5c29eee155f4e8e661fb79aa05573ca10bbbdd2..61a504b062ea0546c971a168e2fc95a4ab47bae5 100644 (file)
--- a/CRM/Case/XMLRepository.php
+++ b/CRM/Case/XMLRepository.php
@@ -77,6 +77,13 @@ class CRM_Case_XMLRepository {
    * @return SimpleXMLElement|FALSE
    */
   public function retrieve($caseType) {
+    // check if xml definition is defined in db
+    $definition = CRM_Core_DAO::getFieldValue('CRM_Case_DAO_CaseType', $caseType, 'definition', 'name');
+
+    if (!empty($definition)) {
+      return simplexml_load_string($definition);
+    }
+
     $caseType = CRM_Case_XMLProcessor::mungeCaseType($caseType);
 
     if (!CRM_Utils_Array::value($caseType, $this->xml)) {