diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-07-13 17:43:10 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-13 17:43:10 -0700 |
commit | 6916c1076cd238779a9653adce81eabda2b655ab (patch) | |
tree | edaf7d6f86573c8f19b4d420496b59b0f6476a6f /mod | |
parent | 69a4cf73a310b3df1f80460addb27acf1fea5f2b (diff) | |
parent | 86633bda48af77483a082d79c1bec7abc3febab3 (diff) | |
download | volse-hubzilla-6916c1076cd238779a9653adce81eabda2b655ab.tar.gz volse-hubzilla-6916c1076cd238779a9653adce81eabda2b655ab.tar.bz2 volse-hubzilla-6916c1076cd238779a9653adce81eabda2b655ab.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'mod')
-rw-r--r-- | mod/menu.php | 2 | ||||
-rw-r--r-- | mod/mitem.php | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mod/menu.php b/mod/menu.php index f46dc9471..7763c4ed1 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -137,7 +137,9 @@ function menu_content(&$a) { $o = replace_macros(get_markup_template('menuedit.tpl'), array( '$header' => t('Edit Menu'), + '$sys' => $a->is_sys, '$menu_id' => intval(argv(1)), + '$menu_edit_link' => 'mitem/' . intval(argv(1)) . (($a->is_sys) ? '?f=&sys=1' : ''), '$hintedit' => t('Add or remove entries to this menu'), '$editcontents' => t('Edit menu contents'), '$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'), diff --git a/mod/mitem.php b/mod/mitem.php index c4c293d1e..bc93165ac 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -44,9 +44,6 @@ function mitem_post(&$a) { if(! $a->data['menu']) return; - - $channel = $a->get_channel(); - if(!$_REQUEST['mitem_desc'] || !$_REQUEST['mitem_link']) { notice( t('Unable to create element.') . EOL); return; @@ -90,9 +87,6 @@ function mitem_post(&$a) { } - - - } @@ -167,7 +161,8 @@ function mitem_content(&$a) { '$submit_more' => t('Submit and continue'), '$display' => $display, '$lockstate' => $lockstate, - '$menu_names' => $menu_names + '$menu_names' => $menu_names, + '$sys' => $a->is_sys )); $o .= replace_macros(get_markup_template('mitemlist.tpl'),array( |