Merge pull request #5087 from annando/issue-4819

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
commit 9b55e52184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -284,6 +284,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
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.
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)) {
notice(L10n::t('Unable to set contact photo.') . EOL);
}