From b2ee367a93d4a7e4e3e7cb129f53ec5cecd1b60b Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Tue, 4 Mar 2014 16:32:23 -0800
Subject: [PATCH] CRM-13981 - Remove reference to obsolete column
 honor_contact_id in Merger.php which was causing fatal error on merge. Remove
 Honoree.tpl which is no longer used.

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  http://issues.civicrm.org/jira/browse/CRM-13981
---
 CRM/Dedupe/Merger.php                         |  2 +-
 .../Form/AdditionalInfo/Honoree.tpl           | 79 -------------------
 2 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 templates/CRM/Contribute/Form/AdditionalInfo/Honoree.tpl

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 132c47987c..183ede1af7 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -198,7 +198,7 @@ class CRM_Dedupe_Merger {
         'civicrm_activity_contact' => array('contact_id'),
         'civicrm_case_contact' => array('contact_id'),
         'civicrm_contact' => array('primary_contact_id'),
-        'civicrm_contribution' => array('contact_id', 'honor_contact_id'),
+        'civicrm_contribution' => array('contact_id'),
         'civicrm_contribution_page' => array('created_id'),
         'civicrm_contribution_recur' => array('contact_id'),
         'civicrm_contribution_soft' => array('contact_id'),
diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/Honoree.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/Honoree.tpl
deleted file mode 100644
index 40c0555b68..0000000000
--- a/templates/CRM/Contribute/Form/AdditionalInfo/Honoree.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*}
-{* this template is used for adding/editing Honoree Information *}
-<div id="id-honoree" class="section-shown crm-contribution-additionalinfo-honoree-form-block">
-      <table class="form-layout-compressed">
-         {if $form.honor_type_id.html}
-      <tr class="crm-contribution-form-block-honor_type_id">
-         <td colspan="3">
-      {$form.honor_type_id.html}<br />
-      <span class="description">{ts}Select an option to reveal honoree information fields.{/ts}</span>
-         </td>
-      </tr>
-         {/if}
-   <tr id="honorType">
-      <td>{$form.honor_prefix_id.html}<br />
-         <span class="description">{$form.honor_prefix_id.label}</span></td>
-      <td>{$form.honor_first_name.html}<br />
-         <span class="description">{$form.honor_first_name.label}</span></td>
-      <td>{$form.honor_last_name.html}<br />
-         <span class="description">{$form.honor_last_name.label}</span></td>
-   </tr>
-   <tr id="honorTypeEmail">
-      <td></td>
-      <td colspan="2">{$form.honor_email.html}<br />
-                <span class="description">{$form.honor_email.label}</td>
-         </tr>
-      </table>
-</div>
-{if $form.honor_type_id.html}
-{literal}
-<script type="text/javascript">
-   enableHonorType();
-   function enableHonorType( ) {
-      var element = document.getElementsByName("honor_type_id");
-      for (var i = 0; i < element.length; i++ ) {
-  var isHonor = false;
-  if ( element[i].checked == true ) {
-      var isHonor = true;
-      break;
-  }
-      }
-      if ( isHonor ) {
-   cj('#honorType').show();
-   cj('#honorTypeEmail').show();
-      } else {
-   cj('#honor_first_name').val('');
-   cj('#honor_last_name').val('');
-   cj('#honor_email').val('');
-   cj('#honor_prefix_id').val('');
-   cj('#honorType').hide();
-   cj('#honorTypeEmail').hide();
-      }
-   }
-</script>
-{/literal}
-{/if}
-- 
2.25.1