aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-13 15:39:19 -0700
committerfriendica <info@friendica.com>2015-03-13 15:39:19 -0700
commit7d5efe88e0c97cea34d5290442d375c0cd609d34 (patch)
tree9ac9fcbe8f65c5780a4a7b94dd629cca3afeca6e /mod
parent4fb7d4f58a7d853b86cbc83ea42fcc2956191e65 (diff)
downloadvolse-hubzilla-7d5efe88e0c97cea34d5290442d375c0cd609d34.tar.gz
volse-hubzilla-7d5efe88e0c97cea34d5290442d375c0cd609d34.tar.bz2
volse-hubzilla-7d5efe88e0c97cea34d5290442d375c0cd609d34.zip
use local_channel() connnections to match the abook against when joining the abook on the discover tab.
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php
index b2888b223..691e860d7 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -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'))) {
require_once('include/identity.php');
$sys = get_sys_channel();
$uids = " and item.uid = " . intval($sys['channel_id']) . " ";
$a->data['firehose'] = intval($sys['channel_id']);
- $abook_uids = "";
}
else {
$uids = " and item.uid = " . local_channel() . " ";
- $abook_uids = " and abook.abook_channel = " . local_channel() . " ";
}
if(get_pconfig(local_channel(),'system','network_list_mode'))