aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php2
-rwxr-xr-xinclude/items.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index b14e609dd..15ce8ce25 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1270,6 +1270,8 @@ function conv_sort($arr,$order) {
}
}
+logger('conv_sort: ' . print_r($ret,true));
+
return $ret;
}
diff --git a/include/items.php b/include/items.php
index cf9b86f06..2a4242ea6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2029,9 +2029,10 @@ function item_store($arr,$allow_exec = false) {
// update the commented timestamp on the parent
- $z = q("select max(created) as commented from item where parent_mid = '%s' and uid = %d ",
+ $z = q("select max(created) as commented from item where parent_mid = '%s' and uid = %d and not ( item_restrict & %d ) ",
dbesc($arr['parent_mid']),
- intval($arr['uid'])
+ intval($arr['uid']),
+ intval(ITEM_DELAYED_PUBLISH)
);
q("UPDATE item set commented = '%s', changed = '%s' WHERE id = %d LIMIT 1",