CRM-15854 - CiviMail workflow, old UI - Consistent interpretation of 'access CiviMail'

[civicrm-core.git] / CRM / Mailing / StateMachine / Send.php

diff --git a/CRM/Mailing/StateMachine/Send.php b/CRM/Mailing/StateMachine/Send.php
index 2fbbfd767712c35aa017198808ddfd53ccf15e1e..47cf26b66854e2bb75f9a8514496482f36fb0748 100644 (file)
--- a/CRM/Mailing/StateMachine/Send.php
+++ b/CRM/Mailing/StateMachine/Send.php
@@ -58,11 +58,11 @@ class CRM_Mailing_StateMachine_Send extends CRM_Core_StateMachine {
     );
 
     if (CRM_Mailing_Info::workflowEnabled()) {
-      if (CRM_Core_Permission::check('schedule mailings')) {
+      if (CRM_Core_Permission::check('schedule mailings') || CRM_Core_Permission::check('access CiviMail')) {
         $this->_pages['CRM_Mailing_Form_Schedule'] = NULL;
       }
 
-      if (CRM_Core_Permission::check('approve mailings')) {
+      if (CRM_Core_Permission::check('approve mailings') || CRM_Core_Permission::check('access CiviMail')) {
         $this->_pages['CRM_Mailing_Form_Approve'] = NULL;
       }
     }