diff options
| author | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
| commit | 912be23e1627211fb417c4b7bced414cbbe38ef0 (patch) | |
| tree | 2b8567d800624167b3eadf37c8855deb0ba74b0b /include/menu.php | |
| parent | ff68ea608786a698ad46637ef13854ac1b1e6beb (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2 volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip | |
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
Diffstat (limited to 'include/menu.php')
| -rw-r--r-- | include/menu.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/menu.php b/include/menu.php index 9dc236605..81e986132 100644 --- a/include/menu.php +++ b/include/menu.php @@ -223,7 +223,7 @@ function menu_add_item($menu_id, $uid, $arr) { $mitem_order = intval($arr['mitem_order']); $mitem_flags = intval($arr['mitem_flags']); - if(local_user() == $uid) { + if(local_channel() == $uid) { $channel = get_app()->get_channel(); } @@ -279,7 +279,7 @@ function menu_edit_item($menu_id, $uid, $arr) { $mitem_flags = intval($arr['mitem_flags']); - if(local_user() == $uid) { + if(local_channel() == $uid) { $channel = get_app()->get_channel(); } |