Fix unit test issue 24068

edenduong · edenduong · commit b32b91b9fe56 · 2019-08-09T09:29:02.000+07:00
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -87,9 +87,9 @@ private function getMca()
      */
     public function isCurrent()
     {
-        $pathUrl = preg_replace('/(\/index|(\/))+($|\/$)/', '', $this->getUrl($this->getPath()));
-        $mcaUrl = preg_replace('/(\/index|(\/))+($|\/$)/', '', $this->getUrl($this->getMca()));
-        return $this->getCurrent() || $pathUrl == $mcaUrl;
+        return $this->getCurrent() ||
+            preg_replace('/(\/index|(\/))+($|\/$)/', '', $this->getUrl($this->getPath()))
+            == preg_replace('/(\/index|(\/))+($|\/$)/', '', $this->getUrl($this->getMca()));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,9 @@ private function getMca()`
`87`	`87`	`*/`
`88`	`88`	`public function isCurrent()`
`89`	`89`	`{`
`90`		`- $pathUrl = preg_replace('/(\/index\|(\/))+($\|\/$)/', '', $this->getUrl($this->getPath()));`
`91`		`- $mcaUrl = preg_replace('/(\/index\|(\/))+($\|\/$)/', '', $this->getUrl($this->getMca()));`
`92`		`- return $this->getCurrent() \|\| $pathUrl == $mcaUrl;`
	`90`	`+ return $this->getCurrent() \|\|`
	`91`	`+ preg_replace('/(\/index\|(\/))+($\|\/$)/', '', $this->getUrl($this->getPath()))`
	`92`	`+ == preg_replace('/(\/index\|(\/))+($\|\/$)/', '', $this->getUrl($this->getMca()));`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/**`