diff options
| author | Mario <mario@mariovavti.com> | 2020-09-22 08:23:28 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-09-22 10:27:52 +0200 |
| commit | 743e575701622a2c672a7c0a84267ab20cba3854 (patch) | |
| tree | 78ba72e107c80ce4491fb736874fc45dd4311b7f /include/connections.php | |
| parent | 759f297aae85f693fe2463fc9057f4e2b27a9668 (diff) | |
| download | volse-hubzilla-743e575701622a2c672a7c0a84267ab20cba3854.tar.gz volse-hubzilla-743e575701622a2c672a7c0a84267ab20cba3854.tar.bz2 volse-hubzilla-743e575701622a2c672a7c0a84267ab20cba3854.zip | |
changelog and use dbq() where apropriate in z6trans_connections()
(cherry picked from commit be627c3f3aa7b4ab4834aff30fba79ee67b4fa50)
Diffstat (limited to 'include/connections.php')
| -rw-r--r-- | include/connections.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/connections.php b/include/connections.php index c7ec163c8..96077cd69 100644 --- a/include/connections.php +++ b/include/connections.php @@ -775,7 +775,7 @@ function vcard_query(&$r) { function z6trans_connections() { - $r = q("SELECT DISTINCT abook.abook_xchan, hubloc.hubloc_addr, hubloc.hubloc_url, hubloc.hubloc_guid, site.site_project, site.site_version FROM abook + $r = dbq("SELECT DISTINCT abook.abook_xchan, hubloc.hubloc_addr, hubloc.hubloc_url, hubloc.hubloc_guid, site.site_project, site.site_version FROM abook LEFT JOIN hubloc ON abook_xchan = hubloc_hash LEFT JOIN site ON hubloc_url = site_url WHERE abook.abook_self = 0 AND hubloc.hubloc_network = 'zot' @@ -806,7 +806,7 @@ function z6trans_connections() { logger("z6trans_connections: transition $zot_xchan to $zot6_xchan"); - q("START TRANSACTION"); + dbq("START TRANSACTION"); $q1 = q("UPDATE abook set abook_xchan = '%s' WHERE abook_xchan = '%s'", dbesc($zot6_xchan), @@ -824,13 +824,13 @@ function z6trans_connections() { ); if($q1 && $q2 && $q3) { - q("COMMIT"); + dbq("COMMIT"); logger("z6trans_connections: completed"); continue; } logger("z6trans_connections: failed - performing rollback"); - q("ROLLBACK"); + dbq("ROLLBACK"); } } |