Fixes #4962. Using get/setData() methods to store menu item original_order.

diff --git a/engine/classes/ElggMenuBuilder.php b/engine/classes/ElggMenuBuilder.php
index df0f9147fb73f6e604231816f984bc05d9680786..d7f85685cf84fc66a8c7da2cfe191e05c0b20b35 100644 (file)
--- a/engine/classes/ElggMenuBuilder.php
+++ b/engine/classes/ElggMenuBuilder.php
@@ -205,7 +205,7 @@ class ElggMenuBuilder {
                // sort each section
                foreach ($this->menu as $index => $section) {
                        foreach ($section as $key => $node) {
-                               $section[$key]->original_order = $key;
+                               $section[$key]->setData('original_order', $key);
                        }
                        usort($section, $sort_callback);
                        $this->menu[$index] = $section;
@@ -240,7 +240,7 @@ class ElggMenuBuilder {
 
                $result = strnatcmp($at, $bt);
                if ($result === 0) {
-                       return $a->original_order - $b->original_order;
+                       return $a->getData('original_order') - $b->getData('original_order');
                }
                return $result;
        }
@@ -258,7 +258,7 @@ class ElggMenuBuilder {
 
                $result = strcmp($an, $bn);
                if ($result === 0) {
-                       return $a->original_order - $b->original_order;
+                       return $a->getData('original_order') - $b->getData('original_order');
                }
                return $result;
        }
@@ -275,7 +275,7 @@ class ElggMenuBuilder {
                $bw = $b->getWeight();
 
                if ($aw == $bw) {
-                       return $a->original_order - $b->original_order;
+                       return $a->getData('original_order') - $b->getData('original_order');
                }
                return $aw - $bw;
        }

diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index fe25f3ddde5c4161fab90e4920a097ca66699d30..81ce6c09913b3e70fce5995af4aacf95051cc288 100644 (file)
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -543,7 +543,7 @@ class ElggMenuItem {
         */
        public function sortChildren($sortFunction) {
                foreach ($this->data['children'] as $key => $node) {
-                       $this->data['children'][$key]->original_order = $key;
+                       $this->data['children'][$key]->data['original_order'] = $key;
                }
                usort($this->data['children'], $sortFunction);
        }