Skip to content

Commit 46a6da7

Browse files
authored
Merge pull request #915 from kenjis/fix-remove-url_is
fix: replace `url_is()`
2 parents a879923 + a8287bb commit 46a6da7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Filters/AbstractAuthFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function before(RequestInterface $request, $arguments = null)
3030

3131
if (! auth()->loggedIn()) {
3232
// Set the entrance url to redirect a user after successful login
33-
if (! url_is('login')) {
33+
if (uri_string() !== route_to('login')) {
3434
$session = session();
3535
$session->setTempdata('beforeLoginUrl', current_url(), 300);
3636
}

src/Filters/SessionAuth.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function before(RequestInterface $request, $arguments = null)
7575
->with('error', $authenticator->getPendingMessage());
7676
}
7777

78-
if (! url_is('login')) {
78+
if (uri_string() !== route_to('login')) {
7979
$session = session();
8080
$session->setTempdata('beforeLoginUrl', current_url(), 300);
8181
}

0 commit comments

Comments
 (0)