aboutsummaryrefslogtreecommitdiffstats
path: root/include/connections.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-06 17:39:43 -0700
committerzotlabs <mike@macgirvin.com>2017-06-06 17:39:43 -0700
commit40b9130c63fbcc5bfd4ba5feb5463000dfe99d43 (patch)
tree21585ce9f10d9a2eeef5d8f253bc362cad8a99a8 /include/connections.php
parentf3061651d448fed44dcd628d2d4a2ad4e63a70f4 (diff)
parent4784f847c9d752c34ff4eeec8a6c40455fe313ce (diff)
downloadvolse-hubzilla-40b9130c63fbcc5bfd4ba5feb5463000dfe99d43.tar.gz
volse-hubzilla-40b9130c63fbcc5bfd4ba5feb5463000dfe99d43.tar.bz2
volse-hubzilla-40b9130c63fbcc5bfd4ba5feb5463000dfe99d43.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/connections.php')
-rw-r--r--include/connections.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/connections.php b/include/connections.php
index 8f4f84e1a..167f7e2c4 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -415,9 +415,9 @@ function random_profile() {
for($i = 0; $i < $retryrandom; $i++) {
- $r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where xchan_addr not like '%s' and xchan_hidden = 0 and hubloc_connected > %s - interval %s order by $randfunc limit 1",
- dbesc('sys@%'),
- db_utcnow(), db_quoteinterval('30 day')
+ $r = q("select xchan_url, xchan_hash from xchan left join hubloc on hubloc_hash = xchan_hash where xchan_hidden = 0 and xchan_system = 0 and hubloc_connected > %s - interval %s order by $randfunc limit 1",
+ db_utcnow(),
+ db_quoteinterval('30 day')
);
if(!$r) return ''; // Couldn't get a random channel
@@ -425,12 +425,12 @@ function random_profile() {
if($checkrandom) {
$x = z_fetch_url($r[0]['xchan_url']);
if($x['success'])
- return $r[0]['xchan_url'];
+ return $r[0]['xchan_hash'];
else
logger('Random channel turned out to be bad.');
}
else {
- return $r[0]['xchan_url'];
+ return $r[0]['xchan_hash'];
}
}
@@ -712,4 +712,4 @@ function vcard_query(&$r) {
}
}
}
-} \ No newline at end of file
+}