aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-05-01 10:06:24 +0200
committerMario <mario@mariovavti.com>2019-05-01 10:06:24 +0200
commit256f8dd41b9e22f2b16bf5d912228f84952c748a (patch)
tree4c874b220281b25c293e2ebe8bc6ddde19fa0801 /include
parenta04689b7840f336fed92ec648754cca02dcd90f0 (diff)
parentc340416c9424c285de4701158714541f24d66e85 (diff)
downloadvolse-hubzilla-256f8dd41b9e22f2b16bf5d912228f84952c748a.tar.gz
volse-hubzilla-256f8dd41b9e22f2b16bf5d912228f84952c748a.tar.bz2
volse-hubzilla-256f8dd41b9e22f2b16bf5d912228f84952c748a.zip
Merge branch 'dev' into 'dev'
Add 'reply on comment' feature See merge request hubzilla/core!1614
Diffstat (limited to 'include')
-rw-r--r--include/features.php8
-rwxr-xr-xinclude/items.php5
2 files changed, 12 insertions, 1 deletions
diff --git a/include/features.php b/include/features.php
index d021f9394..b0d02c141 100644
--- a/include/features.php
+++ b/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'),
]
],
diff --git a/include/items.php b/include/items.php
index 95b696034..7a5c2c3c3 100755
--- a/include/items.php
+++ b/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']),