Return system account data when fetching data for user "0"

diff --git a/src/Model/User.php b/src/Model/User.php
index 4362a6f7b45559242e8861635efc8556c08aa324..73636a9953762bb4726e9db45a2a3ca10bac4efa 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -118,8 +118,8 @@ class User
                        }
                }
 
-               $system['spubkey'] = $system['uprvkey'] = $system['prvkey'];
-               $system['username'] = $system['name'];
+               $system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
+               $system['spubkey'] = $system['upubkey'] = $system['pubkey'];
                $system['nickname'] = $system['nick'];
                return $system;
        }
@@ -332,6 +332,10 @@ class User
         */
        public static function getOwnerDataById(int $uid, bool $check_valid = true)
        {
+               if ($uid == 0) {
+                       return self::getSystemAccount();
+               }
+
                if (!empty(self::$owner[$uid])) {
                        return self::$owner[$uid];
                }