Merge pull request #7092 from kioan000/3.4

Only pass user's ID into Users::addRole()
bolt · Oct 16, 2017 · 29d8cee · 29d8cee
2 parents ad4ccdc + 2e4055e
commit 29d8cee
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Users.php b/src/Users.php
@@ -454,7 +454,9 @@ public function checkForRoot()
         $this->app['logger.flash']->info(Trans::__('general.phrase.missing-root-jackpot'));
 
         // If we reach this point, there is no user 'root'. We promote the current user.
-        return $this->addRole($this->getCurrentUser(), 'root');
+        $user = $this->getCurrentUser();
+
+        return $this->addRole($user['id'], 'root');
     }
 
     /**