bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into write-tags

Browse source
This commit is contained in:
Michael 2020-04-29 02:38:33 +00:00
commit 8c44f535b7
7 changed files with 69 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Mail.php
View file

@ -92,7 +92,7 @@ class Mail
'to_email' => $user['email'],
'uid' => $user['uid'],
'item' => $msg,
'parent' => 0,
'parent' => $msg['id'],
'source_name' => $msg['from-name'],
'source_link' => $msg['from-url'],
'source_photo' => $msg['from-photo'],

2
src/Model/Register.php
View file

@ -56,7 +56,7 @@ class Register
*/
public static function getPendingForUser(int $uid)
{
return DBA::selectToArray('pending-view', [], ['uid' => $uid]);
return DBA::selectFirst('pending-view', [], ['uid' => $uid, 'self' => true]);
}
/**