diff options
Diffstat (limited to 'system/libraries/Controller.php')
| -rw-r--r-- | system/libraries/Controller.php | 47 |
1 files changed, 3 insertions, 44 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 2f64c211..830c06e5 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -3,12 +3,12 @@ * Kohana Controller class. The controller class must be extended to work * properly, so this class is defined as abstract. * - * $Id: Controller.php 4365 2009-05-27 21:09:27Z samsoir $ + * $Id: Controller.php 4721 2009-12-17 23:02:07Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ abstract class Controller_Core { @@ -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(); } /** @@ -48,39 +42,4 @@ abstract class Controller_Core { Event::run('system.404'); } - /** - * Includes a View within the controller scope. - * - * @param string view filename - * @param array array of view variables - * @return string - */ - public function _kohana_load_view($kohana_view_filename, $kohana_input_data) - { - if ($kohana_view_filename == '') - return; - - // Buffering on - ob_start(); - - // Import the view variables to local namespace - extract($kohana_input_data, EXTR_SKIP); - - // Views are straight HTML pages with embedded PHP, so importing them - // this way insures that $this can be accessed as if the user was in - // the controller, which gives the easiest access to libraries in views - try - { - include $kohana_view_filename; - } - catch (Exception $e) - { - ob_end_clean(); - throw $e; - } - - // Fetch the output and close the buffer - return ob_get_clean(); - } - } // End Controller Class
\ No newline at end of file |