Fixes #3035 - menu items appearing in reverse registration order

2 files changed, 26 insertions, 9 deletions

diff --git a/engine/classes/ElggMenuBuilder.php b/engine/classes/ElggMenuBuilder.php
index de0017599..df0f9147f 100644
--- a/engine/classes/ElggMenuBuilder.php
+++ b/engine/classes/ElggMenuBuilder.php
@@ -204,6 +204,9 @@ class ElggMenuBuilder {
 
 		// sort each section
 		foreach ($this->menu as $index => $section) {
+			foreach ($section as $key => $node) {
+				$section[$key]->original_order = $key;
+			}
 			usort($section, $sort_callback);
 			$this->menu[$index] = $section;
 
@@ -232,10 +235,14 @@ class ElggMenuBuilder {
 	 * @return bool
 	 */
 	public static function compareByText($a, $b) {
-		$a = $a->getText();
-		$b = $b->getText();
+		$at = $a->getText();
+		$bt = $b->getText();
 
-		return strnatcmp($a, $b);
+		$result = strnatcmp($at, $bt);
+		if ($result === 0) {
+			return $a->original_order - $b->original_order;
+		}
+		return $result;
 	}
 
 	/**
@@ -246,10 +253,14 @@ class ElggMenuBuilder {
 	 * @return bool
 	 */
 	public static function compareByName($a, $b) {
-		$a = $a->getName();
-		$b = $b->getName();
+		$an = $a->getName();
+		$bn = $b->getName();
 
-		return strcmp($a, $b);
+		$result = strcmp($an, $bn);
+		if ($result === 0) {
+			return $a->original_order - $b->original_order;
+		}
+		return $result;
 	}
 
 	/**
@@ -260,9 +271,12 @@ class ElggMenuBuilder {
 	 * @return bool
 	 */
 	public static function compareByWeight($a, $b) {
-		$a = $a->getWeight();
-		$b = $b->getWeight();
+		$aw = $a->getWeight();
+		$bw = $b->getWeight();
 
-		return $a > $b;
+		if ($aw == $bw) {
+			return $a->original_order - $b->original_order;
+		}
+		return $aw - $bw;
 	}
 }
diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index 4bc9144d4..fe25f3ddd 100644
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -542,6 +542,9 @@ class ElggMenuItem {
 	 * @return void
 	 */
 	public function sortChildren($sortFunction) {
+		foreach ($this->data['children'] as $key => $node) {
+			$this->data['children'][$key]->original_order = $key;
+		}
 		usort($this->data['children'], $sortFunction);
 	}