From 21586e85e83765db7d737c765ff07336c2f1c867 Mon Sep 17 00:00:00 2001
From: monishdeb <monish.deb@webaccessglobal.com>
Date: Tue, 29 Sep 2015 15:16:12 +0530
Subject: [PATCH] CRM-17287 fix for XML Exports

----------------------------------------
* CRM-17287: Broken Unit Tests on master
  https://issues.civicrm.org/jira/browse/CRM-17287
---
 CRM/Core/BAO/CustomGroup.php                                    | 2 +-
 tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml      | 2 --
 .../phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml | 2 --
 tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml       | 2 --
 tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml    | 2 --
 .../CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml       | 2 --
 6 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index bfdbb58dbf..dd6c801514 100644
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -123,7 +123,7 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup {
       'is_multiple',
     );
     foreach ($fields as $field) {
-      if (isset($params[$field])) {
+      if (isset($params[$field]) || $field == 'is_multiple') {
         $group->$field = CRM_Utils_Array::value($field, $params, FALSE);
       }
     }
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
index 3ba60791f7..cdfd86852f 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
@@ -8,8 +8,6 @@
       <extends>Activity</extends>
       <style>Inline</style>
       <collapse_display>0</collapse_display>
-      <help_pre></help_pre>
-      <help_post></help_post>
       <weight>1</weight>
       <is_active>1</is_active>
       <table_name>civicrm_value_example_1</table_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
index 506cc451dc..5adfabad73 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
@@ -10,8 +10,6 @@
       <extends_entity_column_value>Meeting</extends_entity_column_value>
       <style>Inline</style>
       <collapse_display>0</collapse_display>
-      <help_pre></help_pre>
-      <help_post></help_post>
       <weight>1</weight>
       <is_active>1</is_active>
       <table_name>civicrm_value_example_1</table_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
index cedc6e16e6..60e160b024 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
@@ -8,8 +8,6 @@
       <extends>Contact</extends>
       <style>Inline</style>
       <collapse_display>0</collapse_display>
-      <help_pre></help_pre>
-      <help_post></help_post>
       <weight>1</weight>
       <is_active>1</is_active>
       <table_name>civicrm_value_example_1</table_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
index 7903a78575..20d9fcb0a1 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
@@ -8,8 +8,6 @@
       <extends>Individual</extends>
       <style>Inline</style>
       <collapse_display>0</collapse_display>
-      <help_pre></help_pre>
-      <help_post></help_post>
       <weight>1</weight>
       <is_active>1</is_active>
       <table_name>civicrm_value_example_1</table_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
index 64b60b799c..9b8a665077 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
@@ -10,8 +10,6 @@
       <extends_entity_column_value>Student</extends_entity_column_value>
       <style>Inline</style>
       <collapse_display>0</collapse_display>
-      <help_pre></help_pre>
-      <help_post></help_post>
       <weight>1</weight>
       <is_active>1</is_active>
       <table_name>civicrm_value_example_1</table_name>
-- 
2.25.1