GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into activity

Browse Source
This commit is contained in:
Evan Prodromou 2011-08-23 00:33:34 -04:00
commit cd3a53e01f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/moremenu.php
View File

@ -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
$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');
} }
} }