Merge remote-tracking branch 'origin/MAGETWO-73301' into 2.2-develop-pr56

viktorpetryk · viktorpetryk · commit b67af41474cf · 2018-11-01T11:21:28.000+02:00
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
@@ -88,7 +88,8 @@ public function getStatuses()
      */
     public function canSendCommentEmail()
     {
-        return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId());
+        return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId())
+            && $this->_authorization->isAllowed('Magento_Sales::email');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ public function getStatuses()`
`88`	`88`	`*/`
`89`	`89`	`public function canSendCommentEmail()`
`90`	`90`	`{`
`91`		`- return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId());`
	`91`	`+ return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId())`
	`92`	`+ && $this->_authorization->isAllowed('Magento_Sales::email');`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`/**`