aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-07 02:04:15 -0700
committerfriendica <info@friendica.com>2013-09-07 02:04:15 -0700
commit9ba6fd7d2872f5c64a9a71922f5791ed2f237ccb (patch)
treec73acb496264b31b9dcf9780ab2bb55d0b1ca3fb
parentd194ee091af0ee15c7f63def7e8c07ee29e38f39 (diff)
downloadvolse-hubzilla-9ba6fd7d2872f5c64a9a71922f5791ed2f237ccb.tar.gz
volse-hubzilla-9ba6fd7d2872f5c64a9a71922f5791ed2f237ccb.tar.bz2
volse-hubzilla-9ba6fd7d2872f5c64a9a71922f5791ed2f237ccb.zip
allow menu management even if there are no menu items
-rw-r--r--mod/mitem.php33
-rw-r--r--version.inc2
2 files changed, 17 insertions, 18 deletions
diff --git a/mod/mitem.php b/mod/mitem.php
index ee690907e..6a5785114 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -111,24 +111,23 @@ function mitem_content(&$a) {
local_user()
);
- if($r) {
- $o = replace_macros(get_markup_template('mitemlist.tpl'),array(
- '$title' => t('Manage Menu Elements'),
- '$menuname' => $a->data['menu']['menu_name'],
- '$menudesc' => $a->data['menu']['menu_desc'],
- '$edmenu' => t('Edit menu'),
- '$menu_id' => $a->data['menu']['menu_id'],
- '$mlist' => $r,
- '$edit' => t('Edit element'),
- '$drop' => t('Drop element'),
- '$new' => t('New element'),
- '$hintmenu' => t('Edit this menu container'),
- '$hintnew' => t('Add menu element'),
- '$hintdrop' => t('Delete this menu item'),
- '$hintedit' => t('Edit this menu item')
- ));
- }
+ $o .= replace_macros(get_markup_template('mitemlist.tpl'),array(
+ '$title' => t('Manage Menu Elements'),
+ '$menuname' => $a->data['menu']['menu_name'],
+ '$menudesc' => $a->data['menu']['menu_desc'],
+ '$edmenu' => t('Edit menu'),
+ '$menu_id' => $a->data['menu']['menu_id'],
+ '$mlist' => $r,
+ '$edit' => t('Edit element'),
+ '$drop' => t('Drop element'),
+ '$new' => t('New element'),
+ '$hintmenu' => t('Edit this menu container'),
+ '$hintnew' => t('Add menu element'),
+ '$hintdrop' => t('Delete this menu item'),
+ '$hintedit' => t('Edit this menu item')
+ ));
+
return $o;
diff --git a/version.inc b/version.inc
index 87ad45fad..5912f3e76 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-09-06.428
+2013-09-07.429