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

Merge pull request #10416 from annando/empty-parents

Browse source 
An empty user id does not have children
This commit is contained in:
Hypolite Petovan 2021-06-19 06:26:20 -04:00 committed by GitHub
parent 08c4d7eedc 7dd5ea42e9
commit 099b4caef2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/User.php
View file

@ -1505,6 +1505,10 @@ class User
*/ */
public static function identities($uid) public static function identities($uid)
{ {
if (empty($uid)) {
return [];
}
$identities = []; $identities = [];
$user = DBA::selectFirst('user', ['uid', 'nickname', 'username', 'parent-uid'], ['uid' => $uid]); $user = DBA::selectFirst('user', ['uid', 'nickname', 'username', 'parent-uid'], ['uid' => $uid]);

6
src/Security/Authentication.php
View file

@ -342,8 +342,10 @@ class Authentication
$this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]); $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]);
// Set the login date for all identities of the user // Set the login date for all identities of the user
$this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], if (!empty($masterUid)) {
['parent-uid' => $masterUid, 'account_removed' => false]); $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()],
['parent-uid' => $masterUid, 'account_removed' => false]);
}
} }
if ($login_initial) { if ($login_initial) {