Merge branch '1.0.x' into activity
This commit is contained in:
commit
cd3a53e01f
@ -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) {
|
||||||
|
if (count($item) == 5) {
|
||||||
list($actionName, $args, $label, $description, $id) = $item;
|
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
|
|||||||
$seeAll = $this->seeAllItem();
|
$seeAll = $this->seeAllItem();
|
||||||
|
|
||||||
if (!empty($seeAll)) {
|
if (!empty($seeAll)) {
|
||||||
|
if (count($seeAll) == 5) {
|
||||||
list($actionName, $args, $label, $description, $id) = $seeAll;
|
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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user