From 6b7e7cd53b41ffc85457447d0523822f0ce6866c Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Mon, 28 Feb 2022 11:31:07 +0000
Subject: [PATCH] Fixed "remove member" bug

---
 src/Controller/OrganisationMembersController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controller/OrganisationMembersController.php b/src/Controller/OrganisationMembersController.php
index 8c3dd8b..5f78903 100644
--- a/src/Controller/OrganisationMembersController.php
+++ b/src/Controller/OrganisationMembersController.php
@@ -358,8 +358,8 @@ class OrganisationMembersController extends SimpleController
         }
 
         // Check if the user is a member of the organisation, pending or no relation at all
-        $memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first();
-        $adminCheck = $organisation->administrators()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first();
+        $memberCheck = $organisation->members()->where('user_id', $user->id)->withPivot('flag_approved')->first();
+        $adminCheck = $organisation->administrators()->where('user_id', $user->id)->withPivot('flag_approved')->first();
         if (!($memberCheck && $memberCheck->pivot->flag_approved) && !($adminCheck && $adminCheck->pivot->flag_approved)) {
             $ms->addMessageTranslated('danger', 'ORGANISATION.MEMBER.NOT_FOUND', [
                 'name' => $organisation->name,