clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace old database queries with the new ones

This commit is contained in:
Michael 2018-05-02 19:26:15 +00:00 committed by Roland Häder
parent cbe12eba76
commit 8b775d48f9
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/message.php
View File

@ -148,7 +148,7 @@ function message_content(App $a)
$cmd = $a->argv[1]; $cmd = $a->argv[1];
if ($cmd === 'drop') { 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); info(L10n::t('Message deleted.') . EOL);
} }
//goaway(System::baseUrl(true) . '/message' ); //goaway(System::baseUrl(true) . '/message' );

2
mod/settings.php
View File

@ -149,7 +149,7 @@ function settings_post(App $a)
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$key = $_POST['remove']; $key = $_POST['remove'];
dba::delete('tokens', ['id' => $key, 'uid' => local_user()]); dba::delete('tokens', ['id' => $key]);
goaway(System::baseUrl(true)."/settings/oauth/"); goaway(System::baseUrl(true)."/settings/oauth/");
return; return;
} }

2
src/Protocol/DFRN.php
View File

@ -2094,6 +2094,8 @@ class DFRN
'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"], 'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]]; 'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])]; $condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
// @TODO No dba:update here?
dba::update('contact', $fields, $condition); dba::update('contact', $fields, $condition);
Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);