From e30d4ad36607616cbc7a76d41ed5010e0964b61d Mon Sep 17 00:00:00 2001 From: Abel Hoogeveen Date: Tue, 12 May 2020 13:10:50 +0200 Subject: [PATCH] Fixed bug where controller was not changed after a routerCallViewEvent Router::defaultCallable did not change the controller in the view upon a change in the RouterCallViewEvent. This has been remedied by adding a check and performing the change when that check results in a discrepency. --- src/FuzeWorks/Router.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/FuzeWorks/Router.php b/src/FuzeWorks/Router.php index cc32824..fab4604 100644 --- a/src/FuzeWorks/Router.php +++ b/src/FuzeWorks/Router.php @@ -371,7 +371,11 @@ class Router // Reset vars $this->view = $event->view; - $this->controller = $event->controller; + if ($this->controller !== $event->controller) + { + $this->controller = $event->controller; + $this->view->setController($this->controller); + } } catch (EventException $e) { throw new RouterException("Could not load view. routerCallViewEvent threw exception: '".$e->getMessage()."'"); }