aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Feed.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-27 06:35:15 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-27 06:35:15 -0400
commitd554681174084e1715dfae4c21af9f6edcbad59e (patch)
treeeb585cce4ebe24d663b2e7eab28a62da612efec1 /Zotlabs/Module/Feed.php
parente00b8a70829213a4333a53a097c2c498d529f5d6 (diff)
parent551cf8ee9413c5c57e7b71d6016466e598636900 (diff)
downloadvolse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.gz
volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.bz2
volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs/Module/Feed.php')
-rw-r--r--Zotlabs/Module/Feed.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Feed.php b/Zotlabs/Module/Feed.php
index 9d33ba2c3..47871eafb 100644
--- a/Zotlabs/Module/Feed.php
+++ b/Zotlabs/Module/Feed.php
@@ -31,7 +31,7 @@ class Feed extends \Zotlabs\Web\Controller {
$channel = $r[0];
- if((intval(get_config('system','block_public'))) && (! get_account_id()))
+ if(observer_prohibited(true))
killme();
logger('mod_feed: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);