harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
redmatrix 2015-09-08 18:45:58 -07:00
parent 50d7554ccd
commit d413b6eba8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/menu.php
View File

@ -47,7 +47,7 @@ function menu_post(&$a) {
else { else {
$r = menu_create($_REQUEST); $r = menu_create($_REQUEST);
if($r) { if($r) {
menu_sync_packet($uid,get_observer_hash(),$menu_id); menu_sync_packet($uid,get_observer_hash(),$r);
//info( t('Menu created.') . EOL); //info( t('Menu created.') . EOL);
goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : '')); goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : ''));

2
mod/mitem.php
View File

@ -75,7 +75,7 @@ function mitem_post(&$a) {
else { else {
$r = menu_add_item($_REQUEST['menu_id'],$uid,$_REQUEST); $r = menu_add_item($_REQUEST['menu_id'],$uid,$_REQUEST);
if($r) { 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); //info( t('Menu element added.') . EOL);
if($_REQUEST['submit']) { if($_REQUEST['submit']) {
goaway(z_root() . '/menu' . (($a->is_sys) ? '?f=&sys=1' : '')); goaway(z_root() . '/menu' . (($a->is_sys) ? '?f=&sys=1' : ''));