AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression due to previous code change

Browse Source
This commit is contained in:
Frederic Guillot
2015-09-16 22:18:21 -04:00
parent 8a2428496f
commit 08e09c1cac
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Core/Router.php
View File

@@ -211,19 +211,19 @@ class Router extends Base
public function dispatch($uri, $query_string = '') public function dispatch($uri, $query_string = '')
{ {
if (! empty($_GET['controller']) && ! empty($_GET['action'])) { if (! empty($_GET['controller']) && ! empty($_GET['action'])) {
$controller = $this->sanitize($_GET['controller'], 'app'); $this->controller = $this->sanitize($_GET['controller'], 'app');
$action = $this->sanitize($_GET['action'], 'index'); $this->action = $this->sanitize($_GET['action'], 'index');
$plugin = ! empty($_GET['plugin']) ? $this->sanitize($_GET['plugin'], '') : ''; $plugin = ! empty($_GET['plugin']) ? $this->sanitize($_GET['plugin'], '') : '';
} }
else { else {
list($controller, $action) = $this->findRoute($this->getPath($uri, $query_string)); // TODO: add plugin for routes list($this->controller, $this->action) = $this->findRoute($this->getPath($uri, $query_string)); // TODO: add plugin for routes
$plugin = ''; $plugin = '';
} }
$class = empty($plugin) ? '\Controller\\'.ucfirst($controller) : '\Plugin\\'.ucfirst($plugin).'\Controller\\'.ucfirst($controller); $class = empty($plugin) ? '\Controller\\'.ucfirst($this->controller) : '\Plugin\\'.ucfirst($plugin).'\Controller\\'.ucfirst($this->controller);
$instance = new $class($this->container); $instance = new $class($this->container);
$instance->beforeAction($controller, $action); $instance->beforeAction($this->controller, $this->action);
$instance->$action(); $instance->{$this->action}();
} }
} }