ENGCOM-1394: [Forwardport] Fix/navigation order function #14864

magento-engcom-team · magento-engcom-team · commit 3994ae1914a0 · 2018-04-26T04:33:19.000-05:00
- Merge Pull Request #14864 from rostyslav-hymon/magento2:2.3-develop-PR-port-14726 - Merged commits: 1. 72ca610 2. 39202ba 3. 727709b
diff --git a/app/code/Magento/Customer/Block/Account/Navigation.php b/app/code/Magento/Customer/Block/Account/Navigation.php
@@ -46,6 +46,10 @@ public function getLinks()
      */
     private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink)
     {
-        return ($firstLink->getSortOrder() < $secondLink->getSortOrder());
+        if ($firstLink->getSortOrder() == $secondLink->getSortOrder()) {
+            return 0;
+        }
+
+         return ($firstLink->getSortOrder() < $secondLink->getSortOrder()) ? 1 : -1;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ public function getLinks()`
`46`	`46`	`*/`
`47`	`47`	`private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink)`
`48`	`48`	`{`
`49`		`- return ($firstLink->getSortOrder() < $secondLink->getSortOrder());`
	`49`	`+ if ($firstLink->getSortOrder() == $secondLink->getSortOrder()) {`
	`50`	`+ return 0;`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ return ($firstLink->getSortOrder() < $secondLink->getSortOrder()) ? 1 : -1;`
`50`	`54`	`}`
`51`	`55`	`}`