harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on surviving hub re-installs

Browse Source
This commit is contained in:
redmatrix 2015-09-18 14:31:29 -07:00
parent f2fefb91d5
commit fdd4c1b9d1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -2,8 +2,8 @@
Hubzilla - Community Server Hubzilla - Community Server
=========================== ===========================
Websites. Redefined. Help us redefine the web - using integrated and united community websites.
-------------------- --------------------------------------------------------------------------
![Hubzilla](images/hubzilla_house_arrows.png) ![Hubzilla](images/hubzilla_house_arrows.png)

8
include/zot.php
View File

@ -296,13 +296,17 @@ function zot_refresh($them, $channel = null, $force = false) {
} else { } else {
$r = null; $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']) { 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']) dbesc($them['xchan_addr'])
); );
} }
if(! $r) { 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']) dbesc($them['xchan_hash'])
); );
} }