From f81874ca49a4a414b359a488b82fd4c274b24472 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 12 Jul 2015 01:04:57 +0200
Subject: fix sys channel menu in a morre standard way

---
 mod/menu.php           | 4 ++--
 mod/mitem.php          | 4 ++--
 view/tpl/mitemedit.tpl | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/menu.php b/mod/menu.php
index 92ddf5a5f..d45405005 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -37,7 +37,7 @@ function menu_post(&$a) {
 		$_REQUEST['menu_id'] = intval(argv(1));
 		$r = menu_edit($_REQUEST);
 		if($r) {
-			//info( t('Menu updated.') . EOL);
+			info( t('Menu updated.') . EOL);
 			goaway(z_root() . '/mitem/' . $menu_id . (($a->is_sys) ? '?f=&sys=1' : '')); 
 		}
 		else
@@ -46,7 +46,7 @@ function menu_post(&$a) {
 	else {
 		$r = menu_create($_REQUEST);
 			if($r) {
-			//info( t('Menu created.') . EOL);
+			info( t('Menu created.') . EOL);
 			goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : '')); 
 		}
 		else
diff --git a/mod/mitem.php b/mod/mitem.php
index e3341f5de..ee2de1cf8 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -149,7 +149,6 @@ function mitem_content(&$a) {
 
 		$create = replace_macros(get_markup_template('mitemedit.tpl'), array(
 			'$menu_id'     => $a->data['menu']['menu_id'],
-			'$action'      => 'mitem/' . $a->data['menu']['menu_id'] . (($a->is_sys) ? '?f=&sys=1' : ''),
 			'$permissions' => t('Menu Item Permissions'),
 			'$permdesc'    => t("\x28click to open/close\x29"),
 			'$aclselect'   => populate_acl($perm_defaults,false),
@@ -162,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(
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index 569552e28..f9dc4e2cc 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -5,7 +5,7 @@
 	</div>
 {{/if}}
 	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-		<form id="mitemedit" action="{{$action}}" method="post" >
+		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
 			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
 			{{if $mitem_id}}
 			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
-- 
cgit v1.2.3