diff options
author | zotlabs <mike@macgirvin.com> | 2016-11-16 14:13:10 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2016-11-16 14:13:10 -0800 |
commit | 91c803ff65314ff50621556da102ea37223cc64c (patch) | |
tree | a753ef63d5f0383eac123ba48412681700f9df7d | |
parent | 7a17ee9f8c4b31f96861d2b28060832395caf0ec (diff) | |
download | volse-hubzilla-91c803ff65314ff50621556da102ea37223cc64c.tar.gz volse-hubzilla-91c803ff65314ff50621556da102ea37223cc64c.tar.bz2 volse-hubzilla-91c803ff65314ff50621556da102ea37223cc64c.zip |
use item from DB for return value
-rw-r--r-- | include/conversation.php | 1 | ||||
-rw-r--r-- | include/wiki.php | 2 |
2 files changed, 1 insertions, 2 deletions
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); } |