more work on surviving hub re-installs

2 files changed, 8 insertions, 4 deletions

diff --git a/README.md b/README.md
index 9de6393b1..7fbc14219 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 Hubzilla - Community Server
 ===========================
 
-Websites. Redefined.
---------------------
+Help us redefine the web - using integrated and united community websites. 
+--------------------------------------------------------------------------
 
 ![Hubzilla](images/hubzilla_house_arrows.png)
 
diff --git a/include/zot.php b/include/zot.php
index ebdcb4cfb..69e361331 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'])
 			);
 		}