Commit a053d96b authored by Evan Prodromou's avatar Evan Prodromou

Better list-unwrapping in MoreMenu

parent ce5b4415
...@@ -101,7 +101,12 @@ class MoreMenu extends Menu ...@@ -101,7 +101,12 @@ class MoreMenu extends Menu
$extended = array_slice($items, self::SOFT_MAX, self::HARD_MAX - self::SOFT_MAX); $extended = array_slice($items, self::SOFT_MAX, self::HARD_MAX - self::SOFT_MAX);
foreach ($extended as $item) { foreach ($extended as $item) {
list($actionName, $args, $label, $description, $id) = $item; if (count($item) == 5) {
list($actionName, $args, $label, $description, $id) = $item;
} else {
list($actionName, $args, $label, $description) = $item;
$id = null;
}
$this->item($actionName, $args, $label, $description, $id, 'extended_menu'); $this->item($actionName, $args, $label, $description, $id, 'extended_menu');
} }
...@@ -109,7 +114,12 @@ class MoreMenu extends Menu ...@@ -109,7 +114,12 @@ class MoreMenu extends Menu
$seeAll = $this->seeAllItem(); $seeAll = $this->seeAllItem();
if (!empty($seeAll)) { if (!empty($seeAll)) {
list($actionName, $args, $label, $description, $id) = $seeAll; if (count($seeAll) == 5) {
list($actionName, $args, $label, $description, $id) = $seeAll;
} else {
list($actionName, $args, $label, $description) = $seeAll;
$id = null;
}
$this->item($actionName, $args, $label, $description, $id, 'extended_menu see_all'); $this->item($actionName, $args, $label, $description, $id, 'extended_menu see_all');
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment