mirror of https://github.com/friendica/friendica
Replace old database queries with the new ones
This commit is contained in:
parent
8bc565be74
commit
d54c79a772
|
@ -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' );
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2094,7 +2094,6 @@ 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"])];
|
||||||
dba::update('contact', $fields, $condition);
|
|
||||||
|
|
||||||
// @TODO No dba:update here?
|
// @TODO No dba:update here?
|
||||||
dba::update('contact', $fields, $condition);
|
dba::update('contact', $fields, $condition);
|
||||||
|
@ -2103,11 +2102,6 @@ class DFRN
|
||||||
|
|
||||||
logger('Contacts are updated.');
|
logger('Contacts are updated.');
|
||||||
|
|
||||||
/// @TODO WHERE DOES $x COME FROM ???
|
|
||||||
if ($x === false) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// update items
|
// update items
|
||||||
// This is an extreme performance killer
|
// This is an extreme performance killer
|
||||||
Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
|
Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
|
||||||
|
|
Loading…
Reference in New Issue