summaryrefslogtreecommitdiff
path: root/modules/gallery/libraries/Menu.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-12-17 22:19:46 -0800
committerBharat Mediratta <bharat@menalto.com>2010-12-17 22:19:46 -0800
commitdbb9b8b1c8ee5395a65b6329c793e7a2c398ef00 (patch)
tree7e37f4a2482465d45c351787b8e524a5aef61c71 /modules/gallery/libraries/Menu.php
parente60edcdeba577e8cdbdbbc700cb3dfe9d0dd9443 (diff)
Sort the Admin > Settings menu instead of relying on module activation order.
Requires making Menu::get() return a reference. Fixes #1545.
Diffstat (limited to 'modules/gallery/libraries/Menu.php')
-rw-r--r--modules/gallery/libraries/Menu.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 3ad6ebef..58852a72 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -223,12 +223,13 @@ class Menu_Core extends Menu_Element {
/**
* Retrieve a Menu_Element by id
*/
- public function get($id) {
+ public function &get($id) {
if (array_key_exists($id, $this->elements)) {
return $this->elements[$id];
}
- return null;
+ $null = null;
+ return $null;
}
public function is_empty() {