From 44a7c67d4bbcf172fa2dc130d49fb4dca166bf3c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 24 Feb 2015 10:50:20 -0800
Subject: [PATCH] CRM_Mailing_Info - Remove dead code

---
 CRM/Mailing/Info.php | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index db1ffa3020..b9fbc681da 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -102,31 +102,17 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     $groupNames = civicrm_api3('Group', 'get', array());
     $headerfooterList = civicrm_api3('MailingComponent', 'get', array());
 
-    // FIXME: The following two items differ between GSOC CiviMail and ABTest branches
-    if (FALSE) {
-      // AB Test
-      $emailAdd = civicrm_api3('Email', 'get', array());
-      $mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
-        'sequential' => 1,
-        'return' => array("msg_html", "id", "msg_title", "msg_subject"),
-        'is_active' => 1,
-        'id' => array('>' => 58),
-      ));
-    }
-    else {
-      // CiviMail UI
-      $emailAdd = civicrm_api3('Email', 'get', array(
-        'sequential' => 1,
-        'return' => "email",
-        'contact_id' => $contactID,
-      ));
-      $mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
-        'sequential' => 1,
-        'return' => array("msg_html", "id", "msg_title", "msg_subject", "msg_text"),
-        'is_active' => 1,
-        'workflow_id' => array('IS NULL' => ""),
-      ));
-    }
+    $emailAdd = civicrm_api3('Email', 'get', array(
+      'sequential' => 1,
+      'return' => "email",
+      'contact_id' => $contactID,
+    ));
+    $mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
+      'sequential' => 1,
+      'return' => array("msg_html", "id", "msg_title", "msg_subject", "msg_text"),
+      'is_active' => 1,
+      'workflow_id' => array('IS NULL' => ""),
+    ));
     $mailGrp = civicrm_api3('MailingGroup', 'get', array());
     $mailTokens = civicrm_api3('Mailing', 'gettokens', array('entity' => array('contact', 'mailing'), 'sequential' => 1));
     $fromAddress = civicrm_api3('OptionGroup', 'get', array(
-- 
2.25.1