diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-02 01:57:30 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-02 01:57:30 +0100 |
| commit | 1c0be3994382ca355db16a2ab9f54dd99a37f1ec (patch) | |
| tree | 725c7b2e3ec9f5970fc3b932d7cf3d29e6845717 /include/text.php | |
| parent | 473e582d1f3e5067c1aecee9c9f2f579864db3ef (diff) | |
| parent | d507484cc52840e90fbe88568a56e61a183ef455 (diff) | |
| download | volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.gz volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.bz2 volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 5 |
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 ++) { |