From: Evan Prodromou <evan@status.net>
Date: Tue, 23 Aug 2011 04:32:46 +0000 (-0400)
Subject: Better list-unwrapping in MoreMenu
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a053d96bf29519d602b36fd33b20c75f81e7c8e1;p=quix0rs-gnu-social.git

Better list-unwrapping in MoreMenu
---

diff --git a/lib/moremenu.php b/lib/moremenu.php
index 8aed58a921..3562ac4148 100644
--- a/lib/moremenu.php
+++ b/lib/moremenu.php
@@ -101,7 +101,12 @@ class MoreMenu extends Menu
                 $extended = array_slice($items, self::SOFT_MAX, self::HARD_MAX - self::SOFT_MAX);
 
                 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');
                 }
 
@@ -109,7 +114,12 @@ class MoreMenu extends Menu
                     $seeAll = $this->seeAllItem();
 
                     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');
                     }
                 }