From 4e9c3b3d641d9f11a78420163dfad46c74e554b8 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 15 Mar 2016 14:24:21 +0100 Subject: [PATCH] Always use the admin when putting poeple in a group --- .../features/bootstrap/Provisioning.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php index bf84058c05..feeb850ae7 100644 --- a/build/integration/features/bootstrap/Provisioning.php +++ b/build/integration/features/bootstrap/Provisioning.php @@ -175,14 +175,15 @@ trait Provisioning { * @param string $group */ public function assureUserBelongsToGroup($user, $group){ - if (!$this->userBelongsToGroup($user, $group)){ - $previous_user = $this->currentUser; - $this->currentUser = "admin"; - $this->addingUserToGroup($user, $group); - $this->currentUser = $previous_user; - } - $this->checkThatUserBelongsToGroup($user, $group); + $previous_user = $this->currentUser; + $this->currentUser = "admin"; + if (!$this->userBelongsToGroup($user, $group)){ + $this->addingUserToGroup($user, $group); + } + + $this->checkThatUserBelongsToGroup($user, $group); + $this->currentUser = $previous_user; } /**