fixed merge conflicts

[civicrm-core.git] / CRM / Contact / Task.php

diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php
index 27aea1f92f090e76b4ac3fd14af6d392e9c1cc4b..7b676063c289e8b7d57d520ac92abb84aca983b8 100644 (file)
--- a/CRM/Contact/Task.php
+++ b/CRM/Contact/Task.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
@@ -242,45 +242,14 @@ class CRM_Contact_Task {
         );
       }
 
-      if (defined('CIVICRM_CIVIMAIL_UI_LEGACY')) {
-        if (CRM_Core_Permission::access('CiviMail')) {
-          self::$_tasks[self::CREATE_MAILING] = array(
-            'title' => ts('Email - schedule/send via CiviMail'),
-            'class' => array(
-              'CRM_Mailing_Form_Group',
-              'CRM_Mailing_Form_Settings',
-              'CRM_Mailing_Form_Upload',
-              'CRM_Mailing_Form_Test',
-              'CRM_Mailing_Form_Schedule',
-            ),
-            'result' => FALSE,
-          );
-        }
-        elseif (CRM_Mailing_Info::workflowEnabled() &&
-          CRM_Core_Permission::check('create mailings')
-        ) {
-          self::$_tasks[self::CREATE_MAILING] = array(
-            'title' => ts('Email - schedule/send via CiviMail'),
-            'class' => array(
-              'CRM_Mailing_Form_Group',
-              'CRM_Mailing_Form_Settings',
-              'CRM_Mailing_Form_Upload',
-              'CRM_Mailing_Form_Test',
-            ),
-            'result' => FALSE,
-          );
-        }
-      }
-      else {
-        if (CRM_Core_Permission::access('CiviMail')
-          || (CRM_Mailing_Info::workflowEnabled() && CRM_Core_Permission::check('create mailings'))
-        ) {
-          self::$_tasks[self::CREATE_MAILING] = array(
-            'title' => ts('Email - schedule/send via CiviMail'),
-            'class' => 'CRM_Mailing_Form_Task_AdhocMailing',
-            'result' => FALSE,
-          );
-        }
+      if (CRM_Core_Permission::access('CiviMail')
+        || (CRM_Mailing_Info::workflowEnabled() && CRM_Core_Permission::check('create mailings'))
+      ) {
+        self::$_tasks[self::CREATE_MAILING] = array(
+          'title' => ts('Email - schedule/send via CiviMail'),
+          'class' => 'CRM_Mailing_Form_Task_AdhocMailing',
+          'result' => FALSE,
+        );
       }
 
       self::$_tasks += CRM_Core_Component::taskList();