Merge pull request #4327 from jmcclelland/default-dashlets

[civicrm-core.git] / CRM / Case / XMLProcessor / Process.php

diff --git a/CRM/Case/XMLProcessor/Process.php b/CRM/Case/XMLProcessor/Process.php
index 4c4548cffb081390e8b97297eebec6fc6c38ac50..c7cf7b78ee2a26481fb83e70dfaa20da40d8a1ac 100644 (file)
--- a/CRM/Case/XMLProcessor/Process.php
+++ b/CRM/Case/XMLProcessor/Process.php
@@ -315,13 +315,13 @@ class CRM_Case_XMLProcessor_Process extends CRM_Case_XMLProcessor {
   function getDeclaredActivityTypes($caseTypeXML) {
     $result = array();
 
-    if ($caseTypeXML->ActivityTypes && $caseTypeXML->ActivityTypes->ActivityType) {
+    if (!empty($caseTypeXML->ActivityTypes) && $caseTypeXML->ActivityTypes->ActivityType) {
       foreach ($caseTypeXML->ActivityTypes->ActivityType as $activityTypeXML) {
         $result[] = (string) $activityTypeXML->name;
       }
     }
 
-    if ($caseTypeXML->ActivitySets && $caseTypeXML->ActivitySets->ActivitySet) {
+    if (!empty($caseTypeXML->ActivitySets) && $caseTypeXML->ActivitySets->ActivitySet) {
       foreach ($caseTypeXML->ActivitySets->ActivitySet as $activitySetXML) {
         if ($activitySetXML->ActivityTypes && $activitySetXML->ActivityTypes->ActivityType) {
           foreach ($activitySetXML->ActivityTypes->ActivityType as $activityTypeXML) {
@@ -343,7 +343,7 @@ class CRM_Case_XMLProcessor_Process extends CRM_Case_XMLProcessor {
   function getDeclaredRelationshipTypes($caseTypeXML) {
     $result = array();
 
-    if ($caseTypeXML->CaseRoles && $caseTypeXML->CaseRoles->RelationshipType) {
+    if (!empty($caseTypeXML->CaseRoles) && $caseTypeXML->CaseRoles->RelationshipType) {
       foreach ($caseTypeXML->CaseRoles->RelationshipType as $relTypeXML) {
         $result[] = (string) $relTypeXML->name;
       }
@@ -395,7 +395,7 @@ AND        a.is_deleted = 0
     $count = CRM_Core_DAO::singleValueQuery($query, $sqlParams);
 
     // check for max instance
-    $caseType = CRM_Case_BAO_Case::getCaseType($params['caseID'], 'title');
+    $caseType = CRM_Case_BAO_Case::getCaseType($params['caseID'], 'name');
     $maxInstance = self::getMaxInstance($caseType, $params['activityTypeName']);
 
     return $maxInstance ? ($count < $maxInstance ? FALSE : TRUE) : FALSE;