Replace old database queries with the new ones

diff --git a/mod/message.php b/mod/message.php
index 987babf74467b72b1111896d42e34198e9562ea9..1e49311d3f436b3fb0f503b442aef50bd4234491 100644 (file)
--- 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 cd45cc50705e69507aae4727933edaf1691dfa32..a869269d5c1275a3d466b3873083b0b91bc62f12 100644 (file)
--- 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 a9e836499feaae3050118caac54a15131d77a162..ea14aa6ffad950b008470598936e11b008a496a1 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2080,7 +2080,6 @@ 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"])];
-               dba::update('contact', $fields, $condition);
 
                // @TODO No dba:update here?
                dba::update('contact', $fields, $condition);