diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/channel.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | include/wiki.php | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/channel.php b/include/channel.php index de685ab4c..4fc873402 100644 --- a/include/channel.php +++ b/include/channel.php @@ -521,7 +521,7 @@ function identity_basic_export($channel_id, $items = false) { $ret['abook'] = $r; for($x = 0; $x < count($ret['abook']); $x ++) { - $xchans[] = $ret['abook'][$x]['abook_chan']; + $xchans[] = $ret['abook'][$x]['abook_xchan']; $abconfig = load_abconfig($channel_id,$ret['abook'][$x]['abook_xchan']); if($abconfig) $ret['abook'][$x]['abconfig'] = $abconfig; diff --git a/include/conversation.php b/include/conversation.php index 61d31fef4..c260eb4a0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1649,7 +1649,6 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ $uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel()); $account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']); - if($uid == local_channel()) { $cal_link = ''; } diff --git a/include/wiki.php b/include/wiki.php index ffa8b66d3..bcdf9d7d8 100644 --- a/include/wiki.php +++ b/include/wiki.php @@ -128,7 +128,7 @@ function wiki_create_wiki($channel, $observer_hash, $wiki, $acl) { if ($item_id) { \Zotlabs\Daemon\Master::Summon(array('Notifier', 'activity', $item_id)); - return array('item' => $arr, 'success' => true); + return array('item' => $post['item'], 'success' => true); } else { return array('item' => null, 'success' => false); } |