Merge branch 'master' into tres

Conflicts:
	include/zot.php

1 files changed, 3 insertions, 2 deletions

diff --git a/include/Contact.php b/include/Contact.php
index 5d211ee66..7e7649b94 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -566,12 +566,13 @@ function contact_remove($channel_id, $abook_id) {
 
 function random_profile() {
 	$randfunc = db_getfunc('rand');
-	
+
 	$checkrandom = get_config('randprofile','check'); // False by default
 	$retryrandom = intval(get_config('randprofile','retry'));
-	if($retryrandom === false) $retryrandom = 5;
+	if($retryrandom == 0) $retryrandom = 5;
 
 	for($i = 0; $i < $retryrandom; $i++) {
+
 		$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1",
 			db_utcnow(), db_quoteinterval('30 day')
 		);