refs #1552

git-svn-id: http://dev.piwik.org/svn/trunk@4160 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 5 insertions, 2 deletions

diff --git a/core/Menu/Abstract.php b/core/Menu/Abstract.php
index 5d3bac95ec..6e6c0b2d3a 100644
--- a/core/Menu/Abstract.php
+++ b/core/Menu/Abstract.php
@@ -65,11 +65,13 @@ abstract class Piwik_Menu_Abstract {
 				if (!isset($this->menu[$menuName]) || empty($subMenuName)) {
 					$this->menu[$menuName]['_url'] = $menuEntry[2];
 					$this->menu[$menuName]['_order'] = $menuEntry[4];
+					$this->menu[$menuName]['_name'] = $menuName;
 					$this->menu[$menuName]['_hasSubmenu'] = false;
 				}
 				if (!empty($subMenuName)) {
 					$this->menu[$menuName][$subMenuName]['_url'] = $menuEntry[2];
 					$this->menu[$menuName][$subMenuName]['_order'] = $menuEntry[4];
+					$this->menu[$menuName][$subMenuName]['_name'] = $subMenuName;
 					$this->menu[$menuName]['_hasSubmenu'] = true;
 				}
 			}
@@ -124,6 +126,7 @@ abstract class Piwik_Menu_Abstract {
 			if (!empty($subMenuOriginal)) {
 				if (isset($this->menu[$mainMenuOriginal][$subMenuOriginal])) {
 					$save = $this->menu[$mainMenuOriginal][$subMenuOriginal];
+					$save['_name'] = $subMenuRenamed;
 					unset($this->menu[$mainMenuOriginal][$subMenuOriginal]);
 					$this->menu[$mainMenuRenamed][$subMenuRenamed] = $save;
 				}
@@ -132,6 +135,7 @@ abstract class Piwik_Menu_Abstract {
 			else {
 				if (isset($this->menu[$mainMenuOriginal])) {
 					$save = $this->menu[$mainMenuOriginal];
+					$save['_name'] = $mainMenuRenamed;
 					unset($this->menu[$mainMenuOriginal]);
 					$this->menu[$mainMenuRenamed] = $save;
 				}
@@ -170,9 +174,8 @@ abstract class Piwik_Menu_Abstract {
 		}
 
 		if ($itemOne['_order'] == $itemTwo['_order']) {
-			return 0;
+			return strcmp($itemOne['_name'], $itemTwo['_name']);
 		}
 		return ($itemOne['_order'] < $itemTwo['_order']) ? -1 : 1;
 	}
-
 }