diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-06-16 14:59:17 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-06-16 14:59:17 +0100 |
| commit | 33696cc8392daeb08d011aa3b1209f3b121898ea (patch) | |
| tree | 466d48f5abc1a4ec1dbf83543471a8ac89428516 /mod/feed.php | |
| parent | 466a6d5227fbaf0a36cd76b5603cb42bb1b7462b (diff) | |
| parent | c4c80a2e472173dfed9b982c6705ccfbb6e6cdab (diff) | |
| download | volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.tar.gz volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.tar.bz2 volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/feed.php')
| -rw-r--r-- | mod/feed.php | 7 |
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(); |