An empty user id does not have children

diff --git a/src/Model/User.php b/src/Model/User.php
index f81b1ce764ad9bf1d2a3814edac58ec50d196556..14f40662b2ea162dcf36689cb579cd731e9ae17b 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -1505,6 +1505,10 @@ class User
         */
        public static function identities($uid)
        {
+               if (empty($uid)) {
+                       return [];
+               }
+
                $identities = [];
 
                $user = DBA::selectFirst('user', ['uid', 'nickname', 'username', 'parent-uid'], ['uid' => $uid]);

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index 430ede13b4bc5e6eb6f1f8e6bf93601d1de1fec0..ce101477e0a2ee043764ea18b70ac98c8d0ad970 100644 (file)
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -342,8 +342,10 @@ class Authentication
                        $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]);
 
                        // Set the login date for all identities of the user
-                       $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()],
-                               ['parent-uid' => $masterUid, 'account_removed' => false]);
+                       if (!empty($masterUid)) {
+                               $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()],
+                                       ['parent-uid' => $masterUid, 'account_removed' => false]);
+                       }
                }
 
                if ($login_initial) {