harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic (very basic) communication showing up on network page

Browse Source
This commit is contained in:
friendica
2012-11-26 23:52:16 -08:00
parent 941c554031
commit e916d71cc5
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mod/channel.php
View File

@@ -165,12 +165,14 @@ function channel_content(&$a, $update = 0) {
$r = q("SELECT distinct(parent) AS `item_id` from item
left join abook on item.author_xchan = abook.abook_xchan
WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d)
AND (item_flags & %d) AND ( item_flags & %d ) AND ( item_flags & %d )
AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra
ORDER BY created DESC",
intval($a->profile['profile_uid']),
intval(ITEM_WALL|ITEM_UNSEEN|ITEM_THREAD_TOP),
intval(ITEM_WALL),
intval(ITEM_UNSEEN),
intval(ITEM_THREAD_TOP),
intval(ABOOK_FLAG_BLOCKED)
);
@@ -196,12 +198,13 @@ function channel_content(&$a, $update = 0) {
$r = q("SELECT id AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan
WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d)
AND (item_flags & %d) and (item_flags & %d)
AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra $sql_extra2
ORDER BY created DESC $pager_sql ",
intval($a->profile['profile_uid']),
intval(ITEM_WALL|ITEM_THREAD_TOP),
intval(ITEM_WALL),
intval(ITEM_THREAD_TOP),
intval(ABOOK_FLAG_BLOCKED)
);