diff options
| -rw-r--r-- | mod/channel.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/channel.php b/mod/channel.php index 8dab365d8..c8a8d38ba 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -135,17 +135,17 @@ function channel_content(&$a, $update = 0, $load = false) { if(($update) && (! $load)) { + $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 ( 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), intval(ITEM_UNSEEN), - intval(ITEM_THREAD_TOP), intval(ABOOK_FLAG_BLOCKED) ); diff --git a/version.inc b/version.inc index 694b7642f..9dde64255 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-01-04.190 +2013-01-05.191 |