Merge branch 'master' of github.com:kohana/kohana

This commit is contained in:
Woody Gilk 2010-07-06 08:32:14 -05:00
commit feb45b7cf4

View file

@ -89,7 +89,7 @@ Route::set('default', '(<controller>(/<action>(/<id>)))')
'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'].