diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-03 21:17:08 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-03 21:17:08 +0200 |
| commit | b959641ca82d45f641a803b58dcfb91a90274956 (patch) | |
| tree | fa658a7f3a8ab4f862e503ad2113fc24bffd0304 /include/channel.php | |
| parent | c50bfa07ca3a456d69d73988f42e58e3282879e9 (diff) | |
| parent | 416adeb169f16fd25f7dbf54232451d8647cc999 (diff) | |
| download | volse-hubzilla-b959641ca82d45f641a803b58dcfb91a90274956.tar.gz volse-hubzilla-b959641ca82d45f641a803b58dcfb91a90274956.tar.bz2 volse-hubzilla-b959641ca82d45f641a803b58dcfb91a90274956.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/channel.php b/include/channel.php index 88dd818e6..c07cd14e2 100644 --- a/include/channel.php +++ b/include/channel.php @@ -640,19 +640,10 @@ function identity_basic_export($channel_id, $items = false) { for($y = 0; $y < count($x); $y ++) { $m = menu_fetch($x[$y]['menu_name'],$channel_id,$ret['channel']['channel_hash']); if($m) - $ret['menu'][] = menu_element($m); + $ret['menu'][] = menu_element($ret['channel'],$m); } } - $x = menu_list($channel_id); - if($x) { - $ret['menu'] = array(); - for($y = 0; $y < count($x); $y ++) { - $m = menu_fetch($x[$y]['menu_name'],$channel_id,$ret['channel']['channel_hash']); - if($m) - $ret['menu'][] = menu_element($m); - } - } $addon = array('channel_id' => $channel_id,'data' => $ret); call_hooks('identity_basic_export',$addon); |