diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 18:46:15 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 18:46:15 -0700 |
commit | 5d32aa94d96faf78b63aed07db016ac01fe7f4d3 (patch) | |
tree | c9451d48b07616b68190a21c87c8cf6ee7fcaa7c | |
parent | f0847e6f32ceb5a91109f968225b3492dcfe6c9c (diff) | |
parent | 50d7554ccd36d483a7fc205215e0d980232ce368 (diff) | |
download | volse-hubzilla-5d32aa94d96faf78b63aed07db016ac01fe7f4d3.tar.gz volse-hubzilla-5d32aa94d96faf78b63aed07db016ac01fe7f4d3.tar.bz2 volse-hubzilla-5d32aa94d96faf78b63aed07db016ac01fe7f4d3.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/menu.php
mod/menu.php
mod/mitem.php
-rw-r--r-- | mod/mitem.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mod/mitem.php b/mod/mitem.php index 0c3f83bdd..d6572bd56 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -204,6 +204,7 @@ function mitem_content(&$a) { $lockstate = (($mitem['allow_cid'] || $mitem['allow_gid'] || $mitem['deny_cid'] || $mitem['deny_gid']) ? 'lock' : 'unlock'); if(argc() == 4 && argv(3) == 'drop') { + menu_sync_packet($uid,get_observer_hash(),$mitem['mitem_menu_id']); $r = menu_del_item($mitem['mitem_menu_id'], $uid, intval(argv(2))); menu_sync_packet($uid,get_observer_hash(),$mitem['mitem_menu_id']); if($r) |