diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 18:45:58 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 18:45:58 -0700 |
| commit | d413b6eba800259e0ba843843e7eebb73155cb4e (patch) | |
| tree | 6b97631072e59b1f9b1e5860f77e795ddfff9822 | |
| parent | 50d7554ccd36d483a7fc205215e0d980232ce368 (diff) | |
| download | volse-hubzilla-d413b6eba800259e0ba843843e7eebb73155cb4e.tar.gz volse-hubzilla-d413b6eba800259e0ba843843e7eebb73155cb4e.tar.bz2 volse-hubzilla-d413b6eba800259e0ba843843e7eebb73155cb4e.zip | |
merge conflicts
| -rw-r--r-- | mod/menu.php | 2 | ||||
| -rw-r--r-- | mod/mitem.php | 2 |
2 files changed, 2 insertions, 2 deletions
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' : '')); |