Merge branch 'dev' into 'dev'

Use thr_parent tp handle reply on comment feature

See merge request hubzilla/core!1617

1 files changed, 6 insertions, 6 deletions

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 11ce1d268..93df95f49 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -329,13 +329,13 @@ class Item extends Controller {
 				$obj_type = ACTIVITY_OBJ_COMMENT;
 	
 			if($parent) {
-				// Get commented post data
-				$rr = q("SELECT parent, mid FROM item WHERE id = %d LIMIT 1",
+				// Get replied comment data
+				$reply = 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'])
+					intval($reply[0]['parent'])
 				);
 			}
 			elseif($parent_mid && $uid) {
@@ -379,7 +379,7 @@ class Item extends Controller {
 
 			// multi-level threading - preserve the info but re-parent to our single level threading
 	
-			$thr_parent = $parent_mid;
+			$thr_parent = $reply[0]['mid'];
 	
 			$route = $parent_item['route'];
 	
@@ -915,7 +915,7 @@ class Item extends Controller {
 		}
 	
 		if($parent_item)
-			$parent_mid = $rr[0]['mid'];
+			$parent_mid = $parent_item['mid'];
 
 
 		// Fallback so that we alway have a thr_parent
@@ -1164,7 +1164,7 @@ class Item extends Controller {
 						'verb'         => ACTIVITY_POST,
 						'otype'        => 'item',
 						'parent'       => $parent,
-						'parent_mid'   => $rr[0]['mid']
+						'parent_mid'   => $parent_item['mid']
 					));
 				
 				}