From bcc7dfd608cacd3a4326d5ffa96ae0b78a6c11e9 Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Mon, 2 Dec 2019 09:42:29 +0100
Subject: [PATCH] Fix installation when registering a user as a node.

---
 public/main/inc/lib/usermanager.lib.php | 2 +-
 public/main/install/install.lib.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
index a812514f94..7227c52aed 100644
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@@ -352,7 +352,7 @@ class UserManager
                 $resourceNode = new ResourceNode();
                 $resourceNode
                     ->setSlug($loginName)
-                    ->setCreator($user)
+                    ->setCreator(api_get_user_entity($creatorId))
                     ->setResourceType($repo->getResourceType())
                     ->setParent($url->getResourceNode());
                 $repo->getEntityManager()->persist($resourceNode);
diff --git a/public/main/install/install.lib.php b/public/main/install/install.lib.php
index d2b6e8eb59..3b9bf7657c 100644
--- a/public/main/install/install.lib.php
+++ b/public/main/install/install.lib.php
@@ -3315,8 +3315,8 @@ function finishInstallationWithContainer(
     $admin = $userManager->find($adminId);
     $urlRepo->addResourceNode($accessUrl, $admin);
 
-    $userManager->addUserToResourceNode($adminId, $accessUrl);
-    $userManager->addUserToResourceNode($anonId, $accessUrl);
+    $userManager->addUserToResourceNode($adminId, $adminId, $accessUrl);
+    $userManager->addUserToResourceNode($anonId, $adminId, $accessUrl);
 
     // Set default language
     Database::update(