strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5087 from annando/issue-4819

Browse source 
Issue 4819: The introduction note is now stored
This commit is contained in:
Tobias Diekershoff 2018-05-19 17:44:42 +02:00 committed by GitHub
parent bba5ce14f7 c214353a5d
commit 9b55e52184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/dfrn_confirm.php
View file

@ -284,6 +284,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
} }
if (($status == 0) && $intro_id) { if (($status == 0) && $intro_id) {
$intro = dba::selectFirst('intro', ['note'], ['id' => $intro_id]);
if (DBM::is_result($intro)) {
dba::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
}
// Success. Delete the notification. // Success. Delete the notification.
dba::delete('intro', ['id' => $intro_id]); dba::delete('intro', ['id' => $intro_id]);
} }
@ -385,7 +390,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
); );
} }
/// @TODO is DBM::is_result() working here?
if (!DBM::is_result($r)) { if (!DBM::is_result($r)) {
notice(L10n::t('Unable to set contact photo.') . EOL); notice(L10n::t('Unable to set contact photo.') . EOL);
} }