friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Progress on #1. Comments are now threaded, at least in the database, for normal view.

This commit is contained in:
Domovoy 2012-07-23 12:56:47 +02:00
parent 96c47a6577
commit da1b47a029
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/conversation.php
View File

@ -582,7 +582,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
// The comment box should now appear under each writable item, not only at the end of the thread, don't bother with $comments_seen
//$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
$show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
@ -681,12 +683,13 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
// The parent is now the item itself, not his parent
$comment = replace_macros($cmnt_tpl,array(
'$return_path' => '',
'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
'$id' => $item['item_id'],
'$parent' => $item['parent'],
'$parent' => $item['item_id'],
'$qcomment' => $qcomment,
'$profile_uid' => $profile_owner,
'$mylink' => $a->contact['url'],

5
mod/item.php
View File

@ -77,14 +77,15 @@ function item_post(&$a) {
);
}
// if this isn't the real parent of the conversation, find it
if($r !== false && count($r)) {
// We are now threading the comments, the parent may have a parent
/*if($r !== false && count($r)) {
$parid = $r[0]['parent'];
if($r[0]['id'] != $r[0]['parent']) {
$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
intval($parid)
);
}
}
}*/
if(($r === false) || (! count($r))) {
notice( t('Unable to locate original post.') . EOL);