Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 10 insertions, 2 deletions

diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index d111f25e..2f64c211 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 3979 2009-02-13 16:46:12Z zombor $
+ * $Id: Controller.php 4365 2009-05-27 21:09:27Z samsoir $
  *
  * @package    Core
  * @author     Kohana Team
@@ -69,7 +69,15 @@ abstract class Controller_Core {
 		// 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;
+		try
+		{
+			include $kohana_view_filename;
+		}
+		catch (Exception $e)
+		{
+			ob_end_clean();
+			throw $e;
+		}
 
 		// Fetch the output and close the buffer
 		return ob_get_clean();