Merge remote-tracking branch '36321/patch-4' into comm_voted

Indraniks · Indraniks · commit 738eeef3fa3c · 2023-02-27T14:17:14.000+05:30
diff --git a/lib/internal/Magento/Framework/DataObject.php b/lib/internal/Magento/Framework/DataObject.php
@@ -128,11 +128,10 @@ public function getData($key = '', $index = null)
             return $this->_data;
         }
 
-        /* process a/b/c key as ['a']['b']['c'] */
-        if ($key !== null && strpos($key, '/') !== false) {
+        $data = $this->_data[$key] ?? null;
+        if ($data === null && $key !== null && strpos($key, '/') !== false) {
+           /* process a/b/c key as ['a']['b']['c'] */
             $data = $this->getDataByPath($key);
-        } else {
-            $data = $this->_getData($key);
         }
 
         if ($index !== null) {

Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,10 @@ public function getData($key = '', $index = null)`
`128`	`128`	`return $this->_data;`
`129`	`129`	`}`
`130`	`130`
`131`		`- /* process a/b/c key as ['a']['b']['c'] */`
`132`		`- if ($key !== null && strpos($key, '/') !== false) {`
	`131`	`+ $data = $this->_data[$key] ?? null;`
	`132`	`+ if ($data === null && $key !== null && strpos($key, '/') !== false) {`
	`133`	`+ /* process a/b/c key as ['a']['b']['c'] */`
`133`	`134`	`$data = $this->getDataByPath($key);`
`134`		`- } else {`
`135`		`- $data = $this->_getData($key);`
`136`	`135`	`}`
`137`	`136`
`138`	`137`	`if ($index !== null) {`