diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-14 13:19:52 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-14 13:19:52 -0700 |
| commit | 9b4d32b68c6f540be0bebb38883aaa002c34d0f2 (patch) | |
| tree | f5c56683dc724a28aac4e0c390ea33f70db90bfc /mod/channel.php | |
| parent | f4e708a02f70e0ca2dbe43419d6f1c92ff2000e9 (diff) | |
| parent | d616099de6984ad8d45e3b8908367bf5a0b8ab31 (diff) | |
| download | volse-hubzilla-9b4d32b68c6f540be0bebb38883aaa002c34d0f2.tar.gz volse-hubzilla-9b4d32b68c6f540be0bebb38883aaa002c34d0f2.tar.bz2 volse-hubzilla-9b4d32b68c6f540be0bebb38883aaa002c34d0f2.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
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 f1b74136e..0af2666cc 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -173,7 +173,7 @@ function channel_content(&$a, $update = 0, $load = false) { $r = q("SELECT distinct parent AS `item_id`, created from item 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 item_wall = 1 $simple_update AND (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra ORDER BY created DESC", |