Merge remote-tracking branch 'upstream/master'

2 files changed, 12 insertions, 3 deletions

diff --git a/include/gprobe.php b/include/gprobe.php
index 48c1c8e14..d8d893d9e 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -14,6 +14,9 @@ function gprobe_run($argv, $argc){
 
 	$url = hex2bin($argv[1]);
 
+	if(! strpos($url,'@'))
+		return;
+
 	$r = q("select * from xchan where xchan_addr = '%s' limit 1",
 		dbesc($url)
 	);
diff --git a/include/zot.php b/include/zot.php
index ebdcb4cfb..6c5a8c289 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -296,13 +296,17 @@ function zot_refresh($them, $channel = null, $force = false) {
 	} else {
 		$r = null;
 
+		// if they re-installed the server we could end up with the wrong record - pointing to the old install.
+		// We'll order by reverse id to try and pick off the newest one first and hopefully end up with the
+		// correct hubloc. If this doesn't work we may have to re-write this section to try them all. 
+
 		if(array_key_exists('xchan_addr',$them) && $them['xchan_addr']) {
-			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_addr = '%s'",
+			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_addr = '%s' order by hubloc_id desc",
 				dbesc($them['xchan_addr'])
 			);
 		}
 		if(! $r) {
-			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s'",
+			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s' order by hubloc_id desc",
 				dbesc($them['xchan_hash'])
 			);
 		}
@@ -1527,6 +1531,8 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 
 	$result = array();
 
+	$result['site'] = z_root();
+
 	// We've validated the sender. Now make sure that the sender is the owner or author
 
 	if(! $public) {
@@ -3691,4 +3697,4 @@ function zotinfo($arr) {
 	}
 	call_hooks('zot_finger',$ret);
 	return($ret);
-}
\ No newline at end of file
+}