Ian province abbreviation patch - issue 724

[civicrm-core.git] / templates / CRM / Contact / Form / Relationship.tpl

diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index dd77d0b844b521fb2c175db2390528d3a3fe070f..5356ce718625f47fa2de20bee7a60caea4cf5889 100644 (file)
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -24,9 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for adding/editing/viewing relationships  *}
-{if $cdType }
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
+
   {if $action eq 4 } {* action = view *}
     <div class="crm-block crm-content-block crm-relationship-view-block">
       <table class="crm-info-panel">
@@ -139,8 +137,8 @@
     </div>
   {/if}
   {if ($action EQ 1) OR ($action EQ 2) }
-    {*include custom data js file - setting includeWysiwygEditor=TRUE because it's already been loaded*}
-    {include file="CRM/common/customData.tpl" includeWysiwygEditor=TRUE}
+    {*include custom data js file *}
+    {include file="CRM/common/customData.tpl"}
     <script type="text/javascript">
       {literal}
       CRM.$(function($) {
@@ -204,5 +202,3 @@
     </div>
   {/if}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-{/if} {* close of custom data else*}
-