diff options
| author | zottel <github@zottel.net> | 2016-08-01 14:07:18 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-08-01 14:07:18 +0200 |
| commit | 55eda16b61041cf5d3aa941f3b2b4329246b1028 (patch) | |
| tree | 175b6395415767523f1046ee42d654efaf1dac8a /include/channel.php | |
| parent | b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f (diff) | |
| parent | 3d0c90cbc5b756c6d54c4d41a136c0a38e67b013 (diff) | |
| download | volse-hubzilla-55eda16b61041cf5d3aa941f3b2b4329246b1028.tar.gz volse-hubzilla-55eda16b61041cf5d3aa941f3b2b4329246b1028.tar.bz2 volse-hubzilla-55eda16b61041cf5d3aa941f3b2b4329246b1028.zip | |
Merge remote-tracking branch 'upstream/dev' 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); |