diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-27 17:57:59 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-27 17:57:59 +0200 |
| commit | 1b82fb7349a7a4048755d92e757efc5dc227b227 (patch) | |
| tree | e614f70f830ed518b185f22203f42c91aea36db0 /include/items.php | |
| parent | 092e7378cdaeefaa7b4a954bd865bba1960f01aa (diff) | |
| parent | 7b28c42693ff41da61abe4974c7a0a7412b6d6e5 (diff) | |
| download | volse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.tar.gz volse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.tar.bz2 volse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index 0079e0e55..2701c3fa2 100755 --- a/include/items.php +++ b/include/items.php @@ -272,6 +272,8 @@ function can_comment_on_post($observer_xchan, $item) { } if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) return true; + if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'diaspora')) + return true; if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],get_app()->get_hostname())) return true; @@ -4366,7 +4368,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) { ); } else { - $r = q("UPDATE item set item_deleted = 1, changed = '%s', edited = '%s' where if = %d", + $r = q("UPDATE item set item_deleted = 1, changed = '%s', edited = '%s' where id = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($item['id']) |