aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-01 20:59:53 -0700
committerfriendica <info@friendica.com>2014-09-01 20:59:53 -0700
commit688722de5bf928c53fa694e0469f81c4ac2b646d (patch)
tree441e364bdf0a3647e9ff737fdbb6af3476695acd
parent5aa18a11af4ec4d40834abdcc06c2914f9296eb5 (diff)
downloadvolse-hubzilla-688722de5bf928c53fa694e0469f81c4ac2b646d.tar.gz
volse-hubzilla-688722de5bf928c53fa694e0469f81c4ac2b646d.tar.bz2
volse-hubzilla-688722de5bf928c53fa694e0469f81c4ac2b646d.zip
fix phantom attachments in feeds
-rw-r--r--include/follow.php2
-rwxr-xr-xinclude/items.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/follow.php b/include/follow.php
index cf6bfde77..e6c42aad1 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -181,7 +181,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
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)
);
if($r)
diff --git a/include/items.php b/include/items.php
index ca6737f8f..370dd5c72 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1592,8 +1592,8 @@ function get_atom_elements($feed,$item,&$author) {
$title = ' ';
if(! $type)
$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');