feeds are bit more standards compliant and a bit less broken now

This commit is contained in:
friendica
2013-06-12 21:12:27 -07:00
parent d996dc58be
commit 2d3a0a6525
3 changed files with 52 additions and 60 deletions

View File

@@ -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();