aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-15 18:41:50 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-15 18:41:50 -0700
commitb9fd8b46141cebbd5658819782f797cf14cef1fd (patch)
treed5067b2e590b2e510cff71bac0447d669cb54da1 /mod
parent7f6e4d5f4a56355b01fd1ccdf433f4b215b3d669 (diff)
parent7db515b77cc17be545358ac1aba9b6b21c460507 (diff)
downloadvolse-hubzilla-b9fd8b46141cebbd5658819782f797cf14cef1fd.tar.gz
volse-hubzilla-b9fd8b46141cebbd5658819782f797cf14cef1fd.tar.bz2
volse-hubzilla-b9fd8b46141cebbd5658819782f797cf14cef1fd.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: include/zot.php
Diffstat (limited to 'mod')
-rw-r--r--mod/channel.php2
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'])