mirror of
https://github.com/friendica/friendica
synced 2024-12-22 17:20:16 +00:00
mod/message return to conversation if message deleted
This commit is contained in:
parent
57fe36e9a3
commit
9915523490
1 changed files with 13 additions and 1 deletions
|
@ -165,11 +165,23 @@ function message_content(App $a)
|
|||
|
||||
$cmd = $a->argv[1];
|
||||
if ($cmd === 'drop') {
|
||||
$r = DBA::SelectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
|
||||
if(!DBA::isResult($r)){
|
||||
info(L10n::t('Conversation not founded.') . EOL);
|
||||
goaway('/message');
|
||||
}
|
||||
|
||||
if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
|
||||
info(L10n::t('Message deleted.') . EOL);
|
||||
}
|
||||
|
||||
goaway('/message' );
|
||||
$rr = DBA::SelectFirst('mail', ['id'], ['convid' => $r['convid'], 'uid' => local_user()]);
|
||||
if(!DBA::isResult($rr)){
|
||||
info(L10n::t('Conversation removed.') . EOL);
|
||||
goaway('/message');
|
||||
}
|
||||
|
||||
goaway('/message/'.$rr['id'] );
|
||||
} else {
|
||||
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
|
|
Loading…
Reference in a new issue