In debug mode uncaught exceptions should display a nice page

diff --git a/lib/base.php b/lib/base.php
index 1ff462819db4b5a1901cff0aeb213be6748f8bda..df57fe979f3e9d8b421ae9fa9d89343b41d2dc36 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -422,9 +422,13 @@ class OC {
                        }
                }
 
-               if (!defined('PHPUNIT_RUN') and !(defined('DEBUG') and DEBUG)) {
-                       OC\Log\ErrorHandler::register();
-                       OC\Log\ErrorHandler::setLogger(OC_Log::$object);
+               if (!defined('PHPUNIT_RUN')) {
+                       if (defined('DEBUG') and DEBUG) {
+                               set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
+                       } else {
+                               OC\Log\ErrorHandler::register();
+                               OC\Log\ErrorHandler::setLogger(OC_Log::$object);
+                       }
                }
 
                // register the stream wrappers