Fixed "must be of type string, null given" ref #2874 (#2878)

sreichel · fballiano · commit 1c9928186511 · 2023-01-02T10:12:57.000+01:00
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php
@@ -110,7 +110,7 @@ public function __construct()
      */
     public function addItem($itemId, array $item)
     {
-        if ($this->isConfirmMassAction($itemId) && !isset($item['confirm'])) {
+        if (is_string($itemId) && $this->isConfirmMassAction($itemId) && !isset($item['confirm'])) {
             $item['confirm'] = Mage::helper('core')->__('Are you sure?');
         }
 
@@ -131,7 +131,7 @@ public function addItem($itemId, array $item)
      * Retrieve massaction item with id $itemId
      *
      * @param string $itemId
-     * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Item
+     * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Item|null
      */
     public function getItem($itemId)
     {

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function __construct()`
`110`	`110`	`*/`
`111`	`111`	`public function addItem($itemId, array $item)`
`112`	`112`	`{`
`113`		`- if ($this->isConfirmMassAction($itemId) && !isset($item['confirm'])) {`
	`113`	`+ if (is_string($itemId) && $this->isConfirmMassAction($itemId) && !isset($item['confirm'])) {`
`114`	`114`	`$item['confirm'] = Mage::helper('core')->__('Are you sure?');`
`115`	`115`	`}`
`116`	`116`
`@@ -131,7 +131,7 @@ public function addItem($itemId, array $item)`
`131`	`131`	`* Retrieve massaction item with id $itemId`
`132`	`132`	`*`
`133`	`133`	`* @param string $itemId`
`134`		`- * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Item`
	`134`	`+ * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Item\|null`
`135`	`135`	`*/`
`136`	`136`	`public function getItem($itemId)`
`137`	`137`	`{`