diff options
author | friendica <info@friendica.com> | 2014-01-03 14:18:48 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-01-03 14:18:48 -0800 |
commit | 9f4e9f247a032d6e88d677474ead0d9cdaca22bb (patch) | |
tree | 3e5e49ceda28f7aba1310504c9ba78724e483f46 /mod/item.php | |
parent | f2ba6ed9982ee4b3b80331a195534f74e510d508 (diff) | |
parent | 24850a4ea4676c96b6e0f97b45b23fe12e1c80a2 (diff) | |
download | volse-hubzilla-9f4e9f247a032d6e88d677474ead0d9cdaca22bb.tar.gz volse-hubzilla-9f4e9f247a032d6e88d677474ead0d9cdaca22bb.tar.bz2 volse-hubzilla-9f4e9f247a032d6e88d677474ead0d9cdaca22bb.zip |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'mod/item.php')
-rw-r--r-- | mod/item.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php index 444248846..2c0a36d52 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1146,8 +1146,9 @@ function item_check_service_class($channel_id,$iswebpage) { if ($iswebpage) { $r = q("select count(i.id) as total from item i right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id ) - and i.parent=i.id and (i.item_restrict & %d) and i.uid= %d ", + and i.parent=i.id and (i.item_restrict & %d) and not (i.item_restrict & %d) and i.uid= %d ", intval(ITEM_WEBPAGE), + intval(ITEM_DELETED), intval($channel_id) ); } |