Merge branch 'master' of github.com:kohana/kohana
This commit is contained in:
commit
feb45b7cf4
|
@ -89,7 +89,7 @@ Route::set('default', '(<controller>(/<action>(/<id>)))')
|
||||||
'action' => 'index',
|
'action' => 'index',
|
||||||
));
|
));
|
||||||
|
|
||||||
if ( ! defined('SUPRESS_REQUEST'))
|
if ( ! defined('SUPPRESS_REQUEST'))
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
|
* Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
|
||||||
|
|
Loading…
Reference in a new issue