Resolve Account sidebar current tab is not marked as Active (issue 24068)

edenduong · edenduong · commit 491b29554b54 · 2019-08-09T07:47:57.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,7 +87,9 @@ private function getMca()
      */
     public function isCurrent()
     {
-        return $this->getCurrent() || $this->getUrl($this->getPath()) == $this->getUrl($this->getMca());
+        $pathUrl = preg_replace('/(\/index|(\/))+($|\/$)/', '', $this->getUrl($this->getPath()));
+        $mcaUrl = preg_replace('/(\/index|(\/))+($|\/$)/', '', $this->getUrl($this->getMca()));
+        return $this->getCurrent() || $pathUrl == $mcaUrl;
     }
 
     /**

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