From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 29 Apr 2014 00:56:51 +0000 (-0700)
Subject: CRM-14559 fix invalid html
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9deb4ed30cd8127c8e187016b6e2d6bc3b03bcbc;p=civicrm-core.git

CRM-14559 fix invalid html
---

diff --git a/CRM/Admin/Form/RelationshipType.php b/CRM/Admin/Form/RelationshipType.php
index e9d3d00b45..944eba370a 100644
--- a/CRM/Admin/Form/RelationshipType.php
+++ b/CRM/Admin/Form/RelationshipType.php
@@ -76,7 +76,7 @@ class CRM_Admin_Form_RelationshipType extends CRM_Admin_Form {
 
 
 
-    $contactTypes = CRM_Contact_BAO_ContactType::getSelectElements();
+    $contactTypes = CRM_Contact_BAO_ContactType::getSelectElements(FALSE, TRUE, '__');
 
     // add select for contact type
     $contactTypeA = &$this->add('select', 'contact_types_a', ts('Contact Type A') . ' ',
@@ -115,12 +115,12 @@ class CRM_Admin_Form_RelationshipType extends CRM_Admin_Form {
       $baoName::retrieve($params, $defaults);
       $defaults['contact_types_a'] = CRM_Utils_Array::value('contact_type_a', $defaults);
       if (CRM_Utils_Array::value('contact_sub_type_a', $defaults)) {
-        $defaults['contact_types_a'] .= CRM_Core_DAO::VALUE_SEPARATOR . $defaults['contact_sub_type_a'];
+        $defaults['contact_types_a'] .= '__' . $defaults['contact_sub_type_a'];
       }
 
       $defaults['contact_types_b'] = $defaults['contact_type_b'];
       if (CRM_Utils_Array::value('contact_sub_type_b', $defaults)) {
-        $defaults['contact_types_b'] .= CRM_Core_DAO::VALUE_SEPARATOR . $defaults['contact_sub_type_b'];
+        $defaults['contact_types_b'] .= '__' . $defaults['contact_sub_type_b'];
       }
       return $defaults;
     }
@@ -153,11 +153,11 @@ class CRM_Admin_Form_RelationshipType extends CRM_Admin_Form {
         $ids['relationshipType'] = $this->_id;
       }
 
-      $cTypeA = CRM_Utils_System::explode(CRM_Core_DAO::VALUE_SEPARATOR,
+      $cTypeA = CRM_Utils_System::explode('__',
         $params['contact_types_a'],
         2
       );
-      $cTypeB = CRM_Utils_System::explode(CRM_Core_DAO::VALUE_SEPARATOR,
+      $cTypeB = CRM_Utils_System::explode('__',
         $params['contact_types_b'],
         2
       );