summaryrefslogtreecommitdiff
path: root/kohana/libraries/Controller.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-03-04 18:15:56 +0000
committerBharat Mediratta <bharat@menalto.com>2009-03-04 18:15:56 +0000
commit014999758e2f4efa433a9c4e71d0551e0b5b318a (patch)
tree8d15d1130c44849ddee8fcb9f6c9aa7603822b99 /kohana/libraries/Controller.php
parentc0e65b202977c78c4562502373f630b8f835f1ff (diff)
Updated Kohana to r4033
Diffstat (limited to 'kohana/libraries/Controller.php')
-rw-r--r--kohana/libraries/Controller.php16
1 files changed, 4 insertions, 12 deletions
diff --git a/kohana/libraries/Controller.php b/kohana/libraries/Controller.php
index 5f946bde..317f5f0c 100644
--- a/kohana/libraries/Controller.php
+++ b/kohana/libraries/Controller.php
@@ -66,18 +66,10 @@ abstract class Controller_Core {
// Import the view variables to local namespace
extract($kohana_input_data, EXTR_SKIP);
- try
- {
- // 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
- include $kohana_view_filename;
- }
- catch (Exception $e)
- {
- // Display the exception using its internal __toString method
- echo $e;
- }
+ // 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
+ include $kohana_view_filename;
// Fetch the output and close the buffer
return ob_get_clean();