Merge branch 'dev' into 'dev'

Add 'reply on comment' feature

See merge request hubzilla/core!1614

2 files changed, 11 insertions, 7 deletions

diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 5983578b3..b7d4a5922 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -265,7 +265,7 @@ class Display extends \Zotlabs\Web\Controller {
 			$sysid = $sys['channel_id'];
 
 			if(local_channel()) {
-				$r = q("SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1",
+				$r = q("SELECT item.parent as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1",
 					intval(local_channel()),
 					dbesc($target_item['parent_mid'])
 				);
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 6bc8c645f..11ce1d268 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -216,7 +216,7 @@ class Item extends Controller {
 	
 		$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
 		$parent_mid = ((x($_REQUEST,'parent_mid')) ? trim($_REQUEST['parent_mid']) : '');
-	
+
 		$remote_xchan = ((x($_REQUEST,'remote_xchan')) ? trim($_REQUEST['remote_xchan']) : false);
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($remote_xchan)
@@ -329,9 +329,14 @@ class Item extends Controller {
 				$obj_type = ACTIVITY_OBJ_COMMENT;
 	
 			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)
 				);
+				// and its parent
+				$r = q("SELECT * FROM item WHERE id = %d LIMIT 1",
+					intval($rr[0]['parent'])
+				);
 			}
 			elseif($parent_mid && $uid) {
 				// This is coming from an API source, and we are logged in
@@ -910,8 +915,7 @@ class Item extends Controller {
 		}
 	
 		if($parent_item)
-			$parent_mid = $parent_item['mid'];
-
+			$parent_mid = $rr[0]['mid'];
 
 
 		// Fallback so that we alway have a thr_parent
@@ -1014,7 +1018,7 @@ class Item extends Controller {
 		$datarray['term']                = $post_tags;
 		$datarray['plink']               = $plink;
 		$datarray['route']               = $route;
-	
+
 
 		// A specific ACL over-rides public_policy completely
  
@@ -1160,7 +1164,7 @@ class Item extends Controller {
 						'verb'         => ACTIVITY_POST,
 						'otype'        => 'item',
 						'parent'       => $parent,
-						'parent_mid'   => $parent_item['mid']
+						'parent_mid'   => $rr[0]['mid']
 					));
 				
 				}