harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix phantom attachments in feeds

Browse Source
This commit is contained in:
friendica 2014-09-01 20:59:53 -07:00
parent 5aa18a11af
commit 688722de5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/follow.php
View File

@ -181,7 +181,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
return $result; return $result;
} }
$r = q("select count(*) as total from abook where abook_account = %d and abook_network = 'rss'", $r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & ABOOK_FLAG_FEED )",
intval($aid) intval($aid)
); );
if($r) if($r)

2
include/items.php
View File

@ -1592,8 +1592,8 @@ function get_atom_elements($feed,$item,&$author) {
$title = ' '; $title = ' ';
if(! $type) if(! $type)
$type = 'application/octet-stream'; $type = 'application/octet-stream';
$res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title );
} }
$res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title );
} }
$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object'); $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');