aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-31 20:51:05 -0700
committerfriendica <info@friendica.com>2014-08-31 20:51:05 -0700
commita63de472cf1b5cff1ebda821d3a6ba39cf37f839 (patch)
tree7150f4d658a6c9b22dbe4c56dfdc8be8961ae1db /include/text.php
parent89d5c42df16ccef9c6c849a98d37e58bbf3dd49a (diff)
downloadvolse-hubzilla-a63de472cf1b5cff1ebda821d3a6ba39cf37f839.tar.gz
volse-hubzilla-a63de472cf1b5cff1ebda821d3a6ba39cf37f839.tar.bz2
volse-hubzilla-a63de472cf1b5cff1ebda821d3a6ba39cf37f839.zip
various rss fixes
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index 410d9bc96..7da6a8f2b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1865,6 +1865,11 @@ function xchan_query(&$items,$abook = true) {
$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
where xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )");
}
+ $xchans = q("select * from xchan where xchan_hash in (" . implode(',',$arr) . ") and xchan_network in ('rss','unknown')");
+ if(! $chans)
+ $chans = $xchans;
+ else
+ $chans = array_merge($xchans,$chans);
}
if($items && count($items) && $chans && count($chans)) {
for($x = 0; $x < count($items); $x ++) {