Meaningful notification message

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

diff --git a/src/Model/User.php b/src/Model/User.php
index 94e41387ba568dd3528e8ef57d9277fce51da1fe..49423ce9ef74792b17423aabd52380ef7ec5006e 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -155,10 +155,12 @@ class User
                $system['region'] = '';
                $system['country-name'] = '';
                $system['net-publish'] = false;
+               $system['picdate'] = '';
+               $system['theme'] = '';
 
                // Ensure that the user contains data
-               $user = DBA::selectFirst('user', ['prvkey'], ['uid' => 0]);
-               if (empty($user['prvkey'])) {
+               $user = DBA::selectFirst('user', ['prvkey', 'guid'], ['uid' => 0]);
+               if (empty($user['prvkey']) || empty($user['guid'])) {
                        $fields = [
                                'username' => $system['name'],
                                'nickname' => $system['nick'],
@@ -167,12 +169,17 @@ class User
                                'prvkey' => $system['prvkey'],
                                'spubkey' => $system['spubkey'],
                                'sprvkey' => $system['sprvkey'],
+                               'guid' => System::createUUID(),
                                'verified' => true,
                                'page-flags' => User::PAGE_FLAGS_SOAPBOX,
                                'account-type' => User::ACCOUNT_TYPE_RELAY,
                        ];
 
                        DBA::update('user', $fields, ['uid' => 0]);
+
+                       $system['guid'] = $fields['guid'];
+               } else {
+                       $system['guid'] = $user['guid'];
                }
 
                return $system;