Merge pull request #9374 from annando/issue-9358-b

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index 4362a6f7b45559242e8861635efc8556c08aa324..ee5c35af8470d4e8208b1c1ab38d4681b3a20376 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];
                }
@@ -362,7 +366,7 @@ class User
                if (!$repair) {
                        // Check if "addr" is present and correct
                        $addr = $owner['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
-                       $repair = ($addr != $owner['addr']);
+                       $repair = ($addr != $owner['addr']) || empty($owner['prvkey']) || empty($owner['pubkey']);
                }
 
                if (!$repair) {