Updated bootstrap and Welcome controller for new request/response changes. Refs #2687
This commit is contained in:
parent
2ff81513b3
commit
9cbf872a15
|
@ -43,7 +43,7 @@ I18n::lang('en-us');
|
|||
|
||||
/**
|
||||
* Set Kohana::$environment if $_ENV['KOHANA_ENV'] has been supplied.
|
||||
*
|
||||
*
|
||||
*/
|
||||
if (isset($_ENV['KOHANA_ENV']))
|
||||
{
|
||||
|
@ -109,8 +109,8 @@ if ( ! defined('SUPPRESS_REQUEST'))
|
|||
* Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
|
||||
* If no source is specified, the URI will be automatically detected.
|
||||
*/
|
||||
echo Request::instance()
|
||||
echo Request::factory()
|
||||
->execute()
|
||||
->send_headers()
|
||||
->response;
|
||||
->body;
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ class Controller_Welcome extends Controller {
|
|||
|
||||
public function action_index()
|
||||
{
|
||||
$this->request->response = 'hello, world!';
|
||||
$this->response->body = 'hello, world!';
|
||||
}
|
||||
|
||||
} // End Welcome
|
||||
|
|
Loading…
Reference in a new issue