CaseType XML - Generate UTF-8 instead of ISO-8859-1

http://forum.civicrm.org/index.php?topic=34525.new

diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php
index 063df8c70a931213987528e5fbaa07cb04e6a02e..4add3227cb0f1b8991ddff6e6c5221c09fed955c 100644 (file)
--- a/CRM/Case/BAO/CaseType.php
+++ b/CRM/Case/BAO/CaseType.php
@@ -107,7 +107,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType {
    * @access public
    */
   static function convertDefinitionToXML($name, $definition) {
-    $xmlFile = '<?xml version="1.0" encoding="iso-8859-1" ?>' . "\n\n<CaseType>\n";
+    $xmlFile = '<?xml version="1.0" encoding="utf-8" ?>' . "\n\n<CaseType>\n";
     $xmlFile .= "<name>{$name}</name>\n";
 
     if (array_key_exists('forkable', $definition)) {

diff --git a/tests/phpunit/CRM/Case/BAO/CaseTypeTest.php b/tests/phpunit/CRM/Case/BAO/CaseTypeTest.php
index ebccffad527882778bef2a9d754bd5b44bab5282..22bdbb4f41e8fa6e9277b6e629b9812c0d5e7541 100644 (file)
--- a/tests/phpunit/CRM/Case/BAO/CaseTypeTest.php
+++ b/tests/phpunit/CRM/Case/BAO/CaseTypeTest.php
@@ -15,7 +15,7 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
   function definitionProvider() {
     $fixtures['empty-defn'] = array(
       'json' => json_encode(array()),
-      'xml' => '<?xml version="1.0" encoding="iso-8859-1" ?>
+      'xml' => '<?xml version="1.0" encoding="utf-8" ?>
 <CaseType>
   <name>Housing Support</name>
 </CaseType>
@@ -28,7 +28,7 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
         'activityTypes' => array(),
         'caseRoles' => array(),
       )),
-      'xml' => '<?xml version="1.0" encoding="iso-8859-1" ?>
+      'xml' => '<?xml version="1.0" encoding="utf-8" ?>
 <CaseType>
   <name>Housing Support</name>
   <ActivityTypes></ActivityTypes>
@@ -41,7 +41,7 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
     $fixtures['one-item-in-each'] = array(
       'json' => json_encode(array(
         'activityTypes' => array(
-          array('name' => 'First act'),
+          array('name' => 'First act (foréign éxamplé)'),
         ),
         'activitySets' => array(
           array(
@@ -57,12 +57,12 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
           array('name' => 'First role', 'creator' => 1, 'manager' => 1),
         ),
       )),
-      'xml' => '<?xml version="1.0" encoding="iso-8859-1" ?>
+      'xml' => '<?xml version="1.0" encoding="utf-8" ?>
 <CaseType>
   <name>Housing Support</name>
   <ActivityTypes>
     <ActivityType>
-      <name>First act</name>
+      <name>First act (foréign éxamplé)</name>
     </ActivityType>
   </ActivityTypes>
   <ActivitySets>
@@ -125,7 +125,7 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
           array('name' => 'Second role'),
         ),
       )),
-      'xml' => '<?xml version="1.0" encoding="iso-8859-1" ?>
+      'xml' => '<?xml version="1.0" encoding="utf-8" ?>
 <CaseType>
   <name>Housing Support</name>
   <ActivityTypes>
@@ -186,7 +186,7 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
       'json' => json_encode(array(
         'forkable' => 0,
       )),
-      'xml' => '<?xml version="1.0" encoding="iso-8859-1" ?>
+      'xml' => '<?xml version="1.0" encoding="utf-8" ?>
 <CaseType>
   <name>Housing Support</name>
   <forkable>0</forkable>
@@ -198,7 +198,7 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
       'json' => json_encode(array(
         'forkable' => 1,
       )),
-      'xml' => '<?xml version="1.0" encoding="iso-8859-1" ?>
+      'xml' => '<?xml version="1.0" encoding="utf-8" ?>
 <CaseType>
   <name>Housing Support</name>
   <forkable>1</forkable>
@@ -285,4 +285,4 @@ class CRM_Case_BAO_CaseTypeTest extends CiviUnitTestCase {
       )
     );
   }
-}
\ No newline at end of file
+}