diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-19 19:12:33 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-19 19:12:33 -0700 |
| commit | fb61c4fb3497d3751bb43f12cadee9e9c7776be9 (patch) | |
| tree | 604989e10424456783fccff1fccc5b14da26db7f /Zotlabs/Module/Pubstream.php | |
| parent | bfaabfb7b5ff639992a01b0e1fc374cd43d536e9 (diff) | |
| parent | 4578649f758e65f1d87ebb98da7cd891d0b90d0d (diff) | |
| download | volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.gz volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.bz2 volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.zip | |
Merge branch '1.8RC'
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index adc16e6e6..312be7718 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -12,7 +12,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $_SESSION['loadtime'] = datetime_convert(); - if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) { + if(observer_prohibited(true)) { return login(); } @@ -71,7 +71,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); } - require_once('include/identity.php'); + require_once('include/channel.php'); require_once('include/security.php'); if(get_config('system','site_firehose')) { |