From 8b775d48f99e83fc523527ccbfa774b9c927e042 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 May 2018 19:26:15 +0000 Subject: [PATCH] Replace old database queries with the new ones --- mod/message.php | 2 +- mod/settings.php | 2 +- src/Protocol/DFRN.php | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/message.php b/mod/message.php index 6a48eb658e..822f5aadec 100644 --- a/mod/message.php +++ b/mod/message.php @@ -148,7 +148,7 @@ function message_content(App $a) $cmd = $a->argv[1]; if ($cmd === 'drop') { - if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) { + if (dba::delete('mail', ['id' => $a->argv[2]])) { info(L10n::t('Message deleted.') . EOL); } //goaway(System::baseUrl(true) . '/message' ); diff --git a/mod/settings.php b/mod/settings.php index c7e61cbe3b..234731439f 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -149,7 +149,7 @@ function settings_post(App $a) check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); $key = $_POST['remove']; - dba::delete('tokens', ['id' => $key, 'uid' => local_user()]); + dba::delete('tokens', ['id' => $key]); goaway(System::baseUrl(true)."/settings/oauth/"); return; } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 19a8a77222..592444e3ca 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -2094,6 +2094,8 @@ class DFRN 'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"], 'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]]; $condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])]; + + // @TODO No dba:update here? dba::update('contact', $fields, $condition); Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); -- 2.39.5