diff options
| author | Mario <mario@mariovavti.com> | 2019-05-01 10:06:24 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-05-01 10:06:24 +0200 |
| commit | 256f8dd41b9e22f2b16bf5d912228f84952c748a (patch) | |
| tree | 4c874b220281b25c293e2ebe8bc6ddde19fa0801 /Zotlabs/Lib | |
| parent | a04689b7840f336fed92ec648754cca02dcd90f0 (diff) | |
| parent | c340416c9424c285de4701158714541f24d66e85 (diff) | |
| download | volse-hubzilla-256f8dd41b9e22f2b16bf5d912228f84952c748a.tar.gz volse-hubzilla-256f8dd41b9e22f2b16bf5d912228f84952c748a.tar.bz2 volse-hubzilla-256f8dd41b9e22f2b16bf5d912228f84952c748a.zip | |
Merge branch 'dev' into 'dev'
Add 'reply on comment' feature
See merge request hubzilla/core!1614
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 40c0fca4b..31259f012 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -305,6 +305,7 @@ class ThreadItem { if($this->is_commentable() && $observer) { $like = array( t("I like this \x28toggle\x29"), t("like")); $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike")); + $reply_to = array( t("Reply on this comment"), t("reply"), t("Reply to")); } if ($shareable) { @@ -348,9 +349,6 @@ class ThreadItem { $list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : ''); - - - $children = $this->get_children(); $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); @@ -373,6 +371,8 @@ class ThreadItem { 'text' => strip_tags($body['html']), 'id' => $this->get_id(), 'mid' => $item['mid'], + 'parent' => $item['parent'], + 'author_id' => $item['author']['xchan_addr'], 'isevent' => $isevent, 'attend' => $attend, 'consensus' => $consensus, @@ -425,9 +425,10 @@ class ThreadItem { 'has_tags' => $has_tags, 'reactions' => $this->reactions, // Item toolbar buttons - 'emojis' => (($this->is_toplevel() && $this->is_commentable() && $observer && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''), + 'emojis' => (($this->is_toplevel() && $this->is_commentable() && $observer && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''), 'like' => $like, 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''), + 'reply_to' => (((! $this->is_toplevel()) && feature_enabled($conv->get_profile_owner(),'reply_to')) ? $reply_to : ''), 'share' => $share, 'embed' => $embed, 'rawmid' => $item['mid'], @@ -869,4 +870,3 @@ class ThreadItem { } - |