aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-06-12 21:12:27 -0700
committerfriendica <info@friendica.com>2013-06-12 21:12:27 -0700
commit2d3a0a65258be35f4c046b6b3e416bf93baa4940 (patch)
tree77dcf922db3f17e0f56631d37be485e315f5c9f6 /mod
parentd996dc58be3010ab2680dbd125e54afb5cfee95a (diff)
downloadvolse-hubzilla-2d3a0a65258be35f4c046b6b3e416bf93baa4940.tar.gz
volse-hubzilla-2d3a0a65258be35f4c046b6b3e416bf93baa4940.tar.bz2
volse-hubzilla-2d3a0a65258be35f4c046b6b3e416bf93baa4940.zip
feeds are bit more standards compliant and a bit less broken now
Diffstat (limited to 'mod')
-rw-r--r--mod/feed.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/mod/feed.php b/mod/feed.php
index a6adc620e..104208875 100644
--- a/mod/feed.php
+++ b/mod/feed.php
@@ -13,7 +13,7 @@ function feed_init(&$a) {
$channel = '';
if(argc() > 1) {
- $r = q("select * from channel where channel_address = '%s' limit 1",
+ $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1",
dbesc(argv(1))
);
if(!($r && count($r)))
@@ -21,11 +21,6 @@ function feed_init(&$a) {
$channel = $r[0];
- // check site and channel permissions
-
- if(!($channel['channel_r_stream'] & PERMS_PUBLIC))
- killme();
-
if((intval(get_config('system','block_public'))) && (! get_account_id()))
killme();