aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-19 17:51:45 -0700
committerfriendica <info@friendica.com>2014-08-19 17:51:45 -0700
commit55d4ceb7e0c249eff337cb303c555bfa5d5bd2a0 (patch)
treee588edde906cf9f78d52562e95450e87070d3492
parent8b5627e77773e40ee95e0ef18808ebbf3b61e094 (diff)
downloadvolse-hubzilla-55d4ceb7e0c249eff337cb303c555bfa5d5bd2a0.tar.gz
volse-hubzilla-55d4ceb7e0c249eff337cb303c555bfa5d5bd2a0.tar.bz2
volse-hubzilla-55d4ceb7e0c249eff337cb303c555bfa5d5bd2a0.zip
also reset comment policy on alternate delivery chains
-rwxr-xr-xinclude/items.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 2b9c937bb..50ce9d3f5 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2498,7 +2498,7 @@ function tag_deliver($uid,$item_id) {
}
$r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
- deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', title = '%s', body = '%s' where id = %d limit 1",
+ deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d limit 1",
intval($flag_bits),
dbesc($u[0]['channel_hash']),
dbesc($u[0]['channel_allow_cid']),
@@ -2507,6 +2507,7 @@ function tag_deliver($uid,$item_id) {
dbesc($u[0]['channel_deny_gid']),
intval($private),
dbesc($new_public_policy),
+ dbesc(map_scope($u[0]['channel_w_comment'])),
dbesc($title),
dbesc($body),
intval($item_id)
@@ -2666,7 +2667,7 @@ function tag_deliver($uid,$item_id) {
}
$r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
- deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', title = '%s', body = '%s' where id = %d limit 1",
+ deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d limit 1",
intval($flag_bits),
dbesc($u[0]['channel_hash']),
dbesc($u[0]['channel_allow_cid']),
@@ -2675,6 +2676,7 @@ function tag_deliver($uid,$item_id) {
dbesc($u[0]['channel_deny_gid']),
intval($private),
dbesc($new_public_policy),
+ dbesc(map_scope($u[0]['channel_w_comment'])),
dbesc($title),
dbesc($body),
intval($item_id)