Skip to content

fix(Router): reset filter info before get defined filters #3592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2020
Merged

fix(Router): reset filter info before get defined filters #3592

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7069fed
fix(Router): reset filter info before get defined filters
lefuentes Sep 2, 2020
8668ab7
fix phpstan
lefuentes Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion system/Router/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class Router implements RouterInterface
* The filter info from Route Collection
* if the matched route should be filtered.
*
* @var string
* @var string|null
*/
protected $filterInfo;

Expand Down Expand Up @@ -175,6 +175,9 @@ public function handle(string $uri = null)
// Decode URL-encoded string
$uri = urldecode($uri);

// Restart filterInfo
$this->filterInfo = null;

if ($this->checkRoutes($uri))
{
if ($this->collection->isFiltered($this->matchedRoute[0]))
Expand Down