From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 30 Mar 2016 23:50:33 +0000 (+1300)
Subject: CRM-18327 Fix filter value  on the contact deleted by merge activity
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e14e412b4bf7cd351f9472446b9917eef4e72b2b;p=civicrm-core.git

CRM-18327 Fix filter value  on the contact deleted by merge activity
---

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index dab2d8ccd1..94ed0dfb1b 100644
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -552,6 +552,7 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_
       'label' => ts('Contact Deleted by Merge'),
       'description' => ts('Contact was merged into another contact'),
       'is_active' => TRUE,
+      'filter' => 1,
     ));
     return TRUE;
   }
diff --git a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
index a3a4f62583..1023eb3b96 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
@@ -16,3 +16,9 @@ SET
   nav2.weight = nav1.weight,
   nav2.has_separator = 1,
   nav2.label = 'Extensions';
+
+--CRM-18327 filter value missed on the contact deleted by merge activity --
+UPDATE civicrm_option_value ov
+LEFT JOIN civicrm_option_group og ON og.id = ov.option_group_id
+SET filter = 1
+WHERE ov.name = 'Contact Deleted by Merge' AND og.name = 'activity_type'