backport small bits of the re-install fix; at least the damaging bits

This commit is contained in:
redmatrix 2015-11-03 20:40:43 -08:00
parent 6aa98a1e91
commit 5dade2b608

View File

@ -724,12 +724,12 @@ function post_post(&$a) {
* Any hub with the same URL and a different sitekey cannot be valid. * Any hub with the same URL and a different sitekey cannot be valid.
* Get rid of them (mark them deleted). There's a good chance they were re-installs. * Get rid of them (mark them deleted). There's a good chance they were re-installs.
*/ */
// fixed in hubzilla with a protocol change
q("update hubloc set hubloc_flags = ( hubloc_flags | %d ) where hubloc_url = '%s' and hubloc_sitekey != '%s' ", // q("update hubloc set hubloc_flags = ( hubloc_flags | %d ) where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
intval(HUBLOC_FLAGS_DELETED), // intval(HUBLOC_FLAGS_DELETED),
dbesc($hub['hubloc_url']), // dbesc($hub['hubloc_url']),
dbesc($hub['hubloc_sitekey']) // dbesc($hub['hubloc_sitekey'])
); // );
/** @TODO check which hub is primary and take action if mismatched */ /** @TODO check which hub is primary and take action if mismatched */