From a9f5ff17aca0165f197d17251f38f8d6f987ad21 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 19 Dec 2014 00:59:46 -0800 Subject: [PATCH] CRM-15578 - Redirect "civicrm/mailing/send" to "civicrm/a/#/mailing/new" --- CRM/Mailing/Controller/Send.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CRM/Mailing/Controller/Send.php b/CRM/Mailing/Controller/Send.php index 9ccf52cc08..e8180db5b9 100644 --- a/CRM/Mailing/Controller/Send.php +++ b/CRM/Mailing/Controller/Send.php @@ -40,6 +40,24 @@ class CRM_Mailing_Controller_Send extends CRM_Core_Controller { function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) { parent::__construct($title, $modal, NULL, FALSE, TRUE); + if (!defined('CIVICRM_CIVIMAIL_UI_LEGACY')) { + // New: civicrm/mailing/send?reset=1 + // Re-use: civicrm/mailing/send?reset=1&mid=%%mid%% + // Continue: civicrm/mailing/send?reset=1&mid=%%mid%%&continue=true + $mid = CRM_Utils_Request::retrieve('mid', 'Positive'); + $continue = CRM_Utils_Request::retrieve('continue', 'String'); + if (!$mid) { + CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/a/', NULL, TRUE, '/mailing/new')); + } + if ($mid && $continue) { + CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/a/', NULL, TRUE, '/mailing/' . $mid)); + } + if ($mid && !$continue) { + CRM_Core_Error::fatal('Not implemented: Re-use mailing'); + // CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/a/', NULL, TRUE, '/mailing/' . $mid)); + } + } + $mailingID = CRM_Utils_Request::retrieve('mid', 'String', $this, FALSE, NULL); // also get the text and html file -- 2.25.1