diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-29 22:04:07 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-29 22:04:07 +0200 |
| commit | 98fa996b3f5125b60e2653bca2218b08041ad6a4 (patch) | |
| tree | 685c3909ac49f7a25cd39877f74ed56ada9b15e0 /mod/channel.php | |
| parent | 07e890a79a5c506b2e32272edf86ad4aba3b8fba (diff) | |
| parent | cbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1 (diff) | |
| download | volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.gz volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.bz2 volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/channel.php')
| -rw-r--r-- | mod/channel.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/channel.php b/mod/channel.php index 9a98ade60..d1064e939 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -175,7 +175,7 @@ function channel_content(&$a, $update = 0, $load = false) { left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) WHERE uid = %d $item_normal AND item_wall = 1 AND item_unseen = 1 - AND (abook.blocked = 0 or abook.abook_flags is null) + AND (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra ORDER BY created DESC", intval($a->profile['profile_uid']) |