diff --git a/ProcessMaker/Managers/DataManager.php b/ProcessMaker/Managers/DataManager.php index 73c8de7d6f..0e1e3575f8 100644 --- a/ProcessMaker/Managers/DataManager.php +++ b/ProcessMaker/Managers/DataManager.php @@ -91,6 +91,10 @@ private function loadUserData(array $data = [], ProcessRequestToken $token = nul unset($userData['remember_token']); $data['_user'] = $userData; } + // Magic variable: _user is removed when the task is SelfService. + if ($token && $token->is_self_service === 1) { + unset($data['_user']); + } return $data; } @@ -123,12 +127,7 @@ private function loadTokenData(array $data = [], ProcessRequestToken $token = nu } // Magic Variable: _user - $user = $token->user ?: Auth::user(); - if ($user) { - $userData = $user->attributesToArray(); - unset($userData['remember_token']); - $data['_user'] = $userData; - } + $data = $this->loadUserData($data, $token); // Magic Variable: _request $request = $token->getInstance() ?: $token->processRequest;