Merge branch 'dev' into 'dev'

Add 'reply on comment' feature

See merge request hubzilla/core!1614

include/features.php

@@ -167,6 +167,14 @@ function get_features($filtered = true, $level = (-1)) {
 				t('Ability to mark special posts with a star indicator'),
 				false,
 				get_config('feature_lock','star_posts'),
+			],
+			
+			[
+				'reply_to',     
+				t('Reply on comment'),				
+				t('Ability to reply on selected comment'),
+				false,
+				get_config('feature_lock','reply_to'),
 			]
 
 		],

include/items.php

@@ -1875,9 +1875,12 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 			// is the new message multi-level threaded?
 			// even though we don't support it now, preserve the info
 			// and re-attach to the conversation parent.
+			
+			// @FIXME when we'll start threaded comments support, 
+			// now this respected on mid / parent_mid level (MK)
 
 			if($r[0]['mid'] != $r[0]['parent_mid']) {
-				$arr['parent_mid'] = $r[0]['parent_mid'];
+				//$arr['parent_mid'] = $r[0]['parent_mid'];
 				$z = q("SELECT * FROM item WHERE mid = '%s' AND parent_mid = '%s' AND uid = %d
 					ORDER BY id ASC LIMIT 1",
 					dbesc($r[0]['parent_mid']),