From 9fd8a087b8385868a5c56e7faeedec39df8d709d Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Thu, 20 Oct 2016 16:48:37 -0400 Subject: [PATCH] Revert some changes that cause issues with other URLs --- app/Models/Server.php | 6 +----- app/Models/Subuser.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/Models/Server.php b/app/Models/Server.php index af62a528b..bf18ddd7a 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -92,11 +92,7 @@ class Server extends Model */ public function __construct() { - if (!is_null(Auth::user())) { - self::$user = Auth::user(); - } else { - throw new \Exception('Auth::user and Dingo::user cannot both be null.'); - } + self::$user = Auth::user(); } /** diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php index 1243a3ddd..5c22adfb7 100644 --- a/app/Models/Subuser.php +++ b/app/Models/Subuser.php @@ -70,11 +70,7 @@ class Subuser extends Model */ public function __construct() { - if (!is_null(Auth::user())) { - self::$user = Auth::user(); - } else { - throw new \Exception('Auth::user and Dingo::user cannot both be null.'); - } + self::$user = Auth::user(); } /**