diff options
author | zotlabs <mike@macgirvin.com> | 2017-11-23 14:00:24 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-11-23 14:00:24 -0800 |
commit | e5141dd91bf483b0458b6f9226b994afbee23524 (patch) | |
tree | 958afce923e2b7b13278c19d8c707daf73bf2a73 /Zotlabs/Lib/ThreadItem.php | |
parent | 9936670f44b53e391d997fd024faa329b8a0c803 (diff) | |
parent | 14f12927436f71c753127be83f348d89b99401b6 (diff) | |
download | volse-hubzilla-e5141dd91bf483b0458b6f9226b994afbee23524.tar.gz volse-hubzilla-e5141dd91bf483b0458b6f9226b994afbee23524.tar.bz2 volse-hubzilla-e5141dd91bf483b0458b6f9226b994afbee23524.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Lib/ThreadItem.php')
-rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 67a507025..197657ab1 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -105,7 +105,17 @@ class ThreadItem { $mode = $conv->get_mode(); - $edlink = (($item['item_type'] == ITEM_TYPE_CARD) ? 'card_edit' : 'editpost'); + switch($item['item_type']) { + case ITEM_TYPE_CARD: + $edlink = 'card_edit'; + break; + case ITEM_TYPE_ARTICLE: + $edlink = 'article_edit'; + break; + default: + $edlink = 'editpost'; + break; + } if(local_channel() && $observer['xchan_hash'] === $item['author_xchan']) $edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit')); @@ -303,7 +313,7 @@ class ThreadItem { $comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children ); $list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : ''); - + @@ -360,6 +370,7 @@ class ThreadItem { 'unverified' => $unverified, 'forged' => $forged, 'location' => $location, + 'divider' => get_pconfig($conv->get_profile_owner(),'system','item_divider'), 'attend_label' => t('Attend'), 'attend_title' => t('Attendance Options'), 'vote_label' => t('Vote'), |