diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 19f3046260..0849f72a97 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -411,14 +411,27 @@ class UsersController extends AdminController { } - + /** + * Get user info for user view + * + * @param int $userId + * @return View + */ public function getView($userId = null) { - $user = User::find($userId); - return View::make('backend/users/view', compact('user')); + + $user = Sentry::getUserProvider()->createModel()->withTrashed()->find($userId); + + if (isset($user->id)) { + return View::make('backend/users/view', compact('user')); + } else { + // Prepare the error message + $error = Lang::get('admin/users/message.user_not_found', compact('id' )); + + // Redirect to the user management page + return Redirect::route('users')->with('error', $error); + } + } - - - }