harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add initial threaded comments support

Browse Source
This commit is contained in:
Max Kostikov 2019-04-29 23:26:20 +02:00
parent 6db323b15e
commit d9be443e53
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zotlabs/Module/Item.php
View File

@ -216,7 +216,7 @@ class Item extends Controller {
$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0); $parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
$parent_mid = ((x($_REQUEST,'parent_mid')) ? trim($_REQUEST['parent_mid']) : ''); $parent_mid = ((x($_REQUEST,'parent_mid')) ? trim($_REQUEST['parent_mid']) : '');
$remote_xchan = ((x($_REQUEST,'remote_xchan')) ? trim($_REQUEST['remote_xchan']) : false); $remote_xchan = ((x($_REQUEST,'remote_xchan')) ? trim($_REQUEST['remote_xchan']) : false);
$r = q("select * from xchan where xchan_hash = '%s' limit 1", $r = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($remote_xchan) dbesc($remote_xchan)
@ -329,9 +329,14 @@ class Item extends Controller {
$obj_type = ACTIVITY_OBJ_COMMENT; $obj_type = ACTIVITY_OBJ_COMMENT;
if($parent) { if($parent) {
$r = q("SELECT * FROM item WHERE id = %d LIMIT 1", // Get commented post data
$rr = q("SELECT parent, mid FROM item WHERE id = %d LIMIT 1",
intval($parent) intval($parent)
); );
// and its parent
$r = q("SELECT * FROM item WHERE id = %d LIMIT 1",
intval($rr[0]['parent'])
);
} }
elseif($parent_mid && $uid) { elseif($parent_mid && $uid) {
// This is coming from an API source, and we are logged in // This is coming from an API source, and we are logged in
@ -910,8 +915,7 @@ class Item extends Controller {
} }
if($parent_item) if($parent_item)
$parent_mid = $parent_item['mid']; $parent_mid = $rr[0]['mid'];
// Fallback so that we alway have a thr_parent // Fallback so that we alway have a thr_parent
@ -1014,7 +1018,7 @@ class Item extends Controller {
$datarray['term'] = $post_tags; $datarray['term'] = $post_tags;
$datarray['plink'] = $plink; $datarray['plink'] = $plink;
$datarray['route'] = $route; $datarray['route'] = $route;
// A specific ACL over-rides public_policy completely // A specific ACL over-rides public_policy completely
@ -1160,7 +1164,7 @@ class Item extends Controller {
'verb' => ACTIVITY_POST, 'verb' => ACTIVITY_POST,
'otype' => 'item', 'otype' => 'item',
'parent' => $parent, 'parent' => $parent,
'parent_mid' => $parent_item['mid'] 'parent_mid' => $rr[0]['mid']
)); ));
} }