|
@@ -204,7 +204,7 @@ discard block |
|
|
block discarded – undo |
|
204
|
204
|
return |
|
205
|
205
|
( |
|
206
|
206
|
(bool) $this->sessionGet(Constants::SESSION_AUTH_PASSED, false) || |
|
207
|
|
- ( $this->config('remember') && $this->getUser()->{$this->config('remember_column')} && ( Carbon::now() <= (new Carbon($this->getUser()->{$this->config('remember_column')}))->addMinutes($this->config('lifetime')) ) ) |
|
|
207
|
+ ($this->config('remember') && $this->getUser()->{$this->config('remember_column')} && (Carbon::now() <= (new Carbon($this->getUser()->{$this->config('remember_column')}))->addMinutes($this->config('lifetime')))) |
|
208
|
208
|
) && |
|
209
|
209
|
!$this->passwordExpired(); |
|
210
|
210
|
} |
|
@@ -226,7 +226,7 @@ discard block |
|
|
block discarded – undo |
|
226
|
226
|
{ |
|
227
|
227
|
$this->sessionPut(Constants::SESSION_AUTH_PASSED, true); |
|
228
|
228
|
|
|
229
|
|
- if (isset(\Cookie::get()[\Auth::getRecallerName()])) { |
|
|
229
|
+ if (isset(\Cookie::get()[ \Auth::getRecallerName() ])) { |
|
230
|
230
|
$user = $this->getUser(); |
|
231
|
231
|
$user->{$this->config('remember_column')} = Carbon::now(); |
|
232
|
232
|
$user->save(); |
Please login to merge, or discard this patch.