CRM-12425, merged #792

CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl

@@ -24,4 +24,9 @@ DROP TABLE IF EXISTS `civicrm_task_status`;
 DROP TABLE IF EXISTS `civicrm_task`;
 DROP TABLE IF EXISTS `civicrm_project`;
 
+-- CRM-12425
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+VALUES (@bounceTypeID, 'X-HmXmrOriginalRecipient');
+
 

xml/templates/civicrm_data.tpl

@@ -1293,7 +1293,8 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, 'sender was rejected'),
     (@bounceTypeID, 'spam(check| reduction software| filters?)'),
     (@bounceTypeID, 'blocked by a user configured filter'),
-    (@bounceTypeID, 'detected as spam');
+    (@bounceTypeID, 'detected as spam'),
+    (@bounceTypeID, 'X-HmXmrOriginalRecipient');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)