From 9b5e1e4a1247f1cfa24cf2706f10d274919b60ad Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Mon, 30 Mar 2015 18:17:06 -0500
Subject: [PATCH] MAGETWO-35610: Merge and Fix Tests
- Fixed outdated references to \Magento\GiftMessage\Helper\Message::isMessagesAllowed as this method has been refactored and renamed from isMessagesAvailable
---
.../Magento/Sales/view/frontend/templates/email/items.phtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
index 2f57c23485c..b8a15bcbb37 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
@@ -34,7 +34,7 @@
<?php echo $block->getChildHtml('order_totals') ?>
</tbody>
</table>
-<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAvailable('order', $_order, $_order->getStore()) && $_order->getGiftMessageId()): ?>
+<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order', $_order, $_order->getStore()) && $_order->getGiftMessageId()): ?>
<?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId()); ?>
<?php if ($_giftMessage): ?>
<br />
--
GitLab