diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-02-16 15:13:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-02-16 15:13:31 -0800 |
| commit | d9d029470f188796988e002eb90e9dbf96d3dd29 (patch) | |
| tree | ef922432ae326f358374535bf68492729134e49e /mod/home.php | |
| parent | ca8e22101803454be60af35d2cf71ae80224805a (diff) | |
| parent | 1d1676094dd82482f113d6de9c2a95407a1a692f (diff) | |
| download | volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.gz volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.bz2 volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/home.php')
| -rw-r--r-- | mod/home.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mod/home.php b/mod/home.php index db4ae9c42..6d5c7db25 100644 --- a/mod/home.php +++ b/mod/home.php @@ -164,9 +164,16 @@ function home_content(&$a, $update = 0, $load = false) { } require_once('include/identity.php'); - $sys = get_sys_channel(); - $uids = " and item.uid = " . intval($sys['channel_id']) . " "; - $a->data['firehose'] = intval($sys['channel_id']); + + if(get_config('system','site_firehose')) { + require_once('include/security.php'); + $uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0 and (item_flags & " . intval(ITEM_WALL) . " ) > 0 "; + } + else { + $sys = get_sys_channel(); + $uids = " and item.uid = " . intval($sys['channel_id']) . " "; + $a->data['firehose'] = intval($sys['channel_id']); + } $page_mode = 'list'; @@ -199,6 +206,7 @@ function home_content(&$a, $update = 0, $load = false) { intval(ABOOK_FLAG_BLOCKED) ); + } // Then fetch all the children of the parents that are on this page |