use local_channel() connnections to match the abook against when joining the abook on the discover tab.

This commit is contained in:
friendica 2015-03-13 15:39:19 -07:00
parent 4fb7d4f58a
commit 7d5efe88e0

View File

@ -337,16 +337,16 @@ function network_content(&$a, $update = 0, $load = false) {
} }
$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
if($firehose && (! get_config('system','disable_discover_tab'))) { if($firehose && (! get_config('system','disable_discover_tab'))) {
require_once('include/identity.php'); require_once('include/identity.php');
$sys = get_sys_channel(); $sys = get_sys_channel();
$uids = " and item.uid = " . intval($sys['channel_id']) . " "; $uids = " and item.uid = " . intval($sys['channel_id']) . " ";
$a->data['firehose'] = intval($sys['channel_id']); $a->data['firehose'] = intval($sys['channel_id']);
$abook_uids = "";
} }
else { else {
$uids = " and item.uid = " . local_channel() . " "; $uids = " and item.uid = " . local_channel() . " ";
$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
} }
if(get_pconfig(local_channel(),'system','network_list_mode')) if(get_pconfig(local_channel(),'system','network_list_mode'))