diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-12-21 20:05:27 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-12-21 20:05:27 -0800 |
| commit | 9285c8c66c530196399eb05bb5561c3fa5538335 (patch) | |
| tree | 7cec68583c01b5b365e7669fefc1adc6360e89a5 /system/libraries/Controller.php | |
| parent | 9c5df1d31bd214fab051b71d092c751a1da20ecc (diff) | |
Updated Kohana to r4724
Diffstat (limited to 'system/libraries/Controller.php')
| -rw-r--r-- | system/libraries/Controller.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index da84bfc1..830c06e5 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -3,7 +3,7 @@ * Kohana Controller class. The controller class must be extended to work * properly, so this class is defined as abstract. * - * $Id: Controller.php 4679 2009-11-10 01:45:52Z isaiah $ + * $Id: Controller.php 4721 2009-12-17 23:02:07Z isaiah $ * * @package Core * @author Kohana Team @@ -27,12 +27,6 @@ abstract class Controller_Core { // Set the instance to the first controller loaded Kohana::$instance = $this; } - - // URI should always be available - $this->uri = URI::instance(); - - // Input should always be available - $this->input = Input::instance(); } /** |