friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-26 16:33:38 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #9055 from annando/zero-owner

Browse source 
Return system account data when fetching data for user "0"
This commit is contained in:
Hypolite Petovan 2020-08-23 06:42:26 -04:00 committed by GitHub
parent 750f83fba0 b61eacdadb
commit c259d2b454
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/User.php
View file

@ -118,8 +118,8 @@ class User
} }
} }
$system['spubkey'] = $system['uprvkey'] = $system['prvkey']; $system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
$system['username'] = $system['name']; $system['spubkey'] = $system['upubkey'] = $system['pubkey'];
$system['nickname'] = $system['nick']; $system['nickname'] = $system['nick'];
return $system; return $system;
} }
@ -332,6 +332,10 @@ class User
*/ */
public static function getOwnerDataById(int $uid, bool $check_valid = true) public static function getOwnerDataById(int $uid, bool $check_valid = true)
{ {
if ($uid == 0) {
return self::getSystemAccount();
}
if (!empty(self::$owner[$uid])) { if (!empty(self::$owner[$uid])) {
return self::$owner[$uid]; return self::$owner[$uid];
} }