diff --git a/classes/controller/devtools.php b/classes/controller/devtools.php index 8119e6a..70555bc 100644 --- a/classes/controller/devtools.php +++ b/classes/controller/devtools.php @@ -43,7 +43,7 @@ public function action_routetest() if ( ! $url) { // Try to find a config file - $url = Kohana::config('route-test'); + $url = Kohana::$config->load('route-test'); } $this->template->content = View::factory('devtools/route-test',array( // Get all the tests diff --git a/classes/devtools/route/tester.php b/classes/devtools/route/tester.php index ce7b3f7..d963df1 100644 --- a/classes/devtools/route/tester.php +++ b/classes/devtools/route/tester.php @@ -52,7 +52,8 @@ public static function create_tests($tests) // Test each route, and save the route and params if it matches foreach (Route::all() as $route) { - if ($current->params = $route->matches($current->url)) + $request = Request::factory($current->url); + if ($current->params = $route->matches($request)) { $current->route = Route::name($route); $current->params = array_merge(array('route'=>$current->route),$current->params); diff --git a/views/devtools/config.php b/views/devtools/config.php index 96b03c1..bbd80d5 100644 --- a/views/devtools/config.php +++ b/views/devtools/config.php @@ -8,7 +8,7 @@ try { - echo Debug::dump(Kohana::config($name)); + echo Debug::dump(Kohana::$config->load($name)); } catch (exception $e) {