diff --git a/src/Venturecraft/Revisionable/RevisionableTrait.php b/src/Venturecraft/Revisionable/RevisionableTrait.php index f298dcf7..586df436 100644 --- a/src/Venturecraft/Revisionable/RevisionableTrait.php +++ b/src/Venturecraft/Revisionable/RevisionableTrait.php @@ -266,14 +266,18 @@ public function postDelete() **/ public function getSystemUserId() { + if (!isset($this->guard)) { + $this->guard = 'web'; + } + try { if (class_exists($class = '\SleepingOwl\AdminAuth\Facades\AdminAuth') || class_exists($class = '\Cartalyst\Sentry\Facades\Laravel\Sentry') || class_exists($class = '\Cartalyst\Sentinel\Laravel\Facades\Sentinel') ) { - return ($class::check()) ? $class::getUser()->id : null; - } elseif (\Auth::check()) { - return \Auth::user()->getAuthIdentifier(); + return ($class::guard($this->guard)->check()) ? $class::getUser()->id : null; + } elseif (\Auth::guard($this->guard)->check()) { + return \Auth::guard($this->guard)->user()->getAuthIdentifier(); } } catch (\Exception $e) { return null;