Merge remote-tracking branch 'origin/MAGETWO-96918' into 2.2.8-develop-pr71

ameysar · ameysar · commit 6c2ac24dfc94 · 2019-01-24T10:42:07.000+02:00
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -83,7 +83,7 @@ protected function _construct()
             -1
         );
 
-        $objId = $this->getRequest()->getParam($this->_objectId);
+        $objId = (int)$this->getRequest()->getParam($this->_objectId);
 
         if (!empty($objId)) {
             $this->addButton(
@@ -155,7 +155,7 @@ public function getBackUrl()
      */
     public function getDeleteUrl()
     {
-        return $this->getUrl('*/*/delete', [$this->_objectId => $this->getRequest()->getParam($this->_objectId)]);
+        return $this->getUrl('*/*/delete', [$this->_objectId => (int)$this->getRequest()->getParam($this->_objectId)]);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ protected function _construct()`
`83`	`83`	`-1`
`84`	`84`	`);`
`85`	`85`
`86`		`- $objId = $this->getRequest()->getParam($this->_objectId);`
	`86`	`+ $objId = (int)$this->getRequest()->getParam($this->_objectId);`
`87`	`87`
`88`	`88`	`if (!empty($objId)) {`
`89`	`89`	`$this->addButton(`
`@@ -155,7 +155,7 @@ public function getBackUrl()`
`155`	`155`	`*/`
`156`	`156`	`public function getDeleteUrl()`
`157`	`157`	`{`
`158`		`- return $this->getUrl('//delete', [$this->_objectId => $this->getRequest()->getParam($this->_objectId)]);`
	`158`	`+ return $this->getUrl('//delete', [$this->_objectId => (int)$this->getRequest()->getParam($this->_objectId)]);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`/**`