From d413b6eba800259e0ba843843e7eebb73155cb4e Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Tue, 8 Sep 2015 18:45:58 -0700
Subject: merge conflicts

---
 mod/menu.php  | 2 +-
 mod/mitem.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mod')

diff --git a/mod/menu.php b/mod/menu.php
index a0a300000..ad47ad1fd 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -47,7 +47,7 @@ function menu_post(&$a) {
 	else {
 		$r = menu_create($_REQUEST);
 		if($r) {
-			menu_sync_packet($uid,get_observer_hash(),$menu_id);
+			menu_sync_packet($uid,get_observer_hash(),$r);
 	
 			//info( t('Menu created.') . EOL);
 			goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : '')); 
diff --git a/mod/mitem.php b/mod/mitem.php
index b62feb97c..60d7885dc 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -75,7 +75,7 @@ function mitem_post(&$a) {
 	else {
 		$r = menu_add_item($_REQUEST['menu_id'],$uid,$_REQUEST);	
 		if($r) {
-			menu_sync_packet($uid,get_observer_hash(),$menu_id);
+			menu_sync_packet($uid,get_observer_hash(),$_REQUEST['menu_id']);
 			//info( t('Menu element added.') . EOL);
 			if($_REQUEST['submit']) {
 				goaway(z_root() . '/menu' . (($a->is_sys) ? '?f=&sys=1' : ''));
-- 
cgit v1.2.3