Bugfix: Argument 2 passed to Mage_GiftMessage_Helper_Message::getIsMessagesAvailable() must be an instance of Varien_Object, null given (#4345)

sreichel · web-flow · commit ceebab57cdfb · 2024-11-12T10:18:42.000+02:00
-
diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php
@@ -182,7 +182,7 @@ public function canDisplayGiftmessage(): bool
         }
         /** @var Mage_GiftMessage_Helper_Message $helper */
         $helper = $this->helper('giftmessage/message');
-        return $helper->getIsMessagesAvailable('order_item', $this->getItem()->getOrderItem()) && $this->getItem()->getGiftMessageId();
+        return $helper->getIsMessagesAvailable('order_item', $this->getOrderItem()) && $this->getItem()->getGiftMessageId();
     }
 
     public function getGiftMessage(): ?Mage_GiftMessage_Model_Message

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function canDisplayGiftmessage(): bool`
`182`	`182`	`}`
`183`	`183`	`/** @var Mage_GiftMessage_Helper_Message $helper */`
`184`	`184`	`$helper = $this->helper('giftmessage/message');`
`185`		`- return $helper->getIsMessagesAvailable('order_item', $this->getItem()->getOrderItem()) && $this->getItem()->getGiftMessageId();`
	`185`	`+ return $helper->getIsMessagesAvailable('order_item', $this->getOrderItem()) && $this->getItem()->getGiftMessageId();`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`public function getGiftMessage(): ?Mage_GiftMessage_Model_Message`