Skip to content

fixes for compatibility with kohana 3.3 #7

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

Open
vansosnin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes for compatibility with kohana 3.3 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion classes/controller/devtools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion classes/devtools/route/tester.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion views/devtools/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

try
{
echo Debug::dump(Kohana::config($name));
echo Debug::dump(Kohana::$config->load($name));
}
catch (exception $e)
{
Expand Down