Changeset 1810

Timestamp:

01/25/2008 12:46:30 PM (10 months ago)

Author:

Shadowhand

Message:

Changes to exception handling:

• Disabling display_errors now shows a generic error message, without no stack trace
  
• All error messages are now properly compressed via global configuration
  
• New i18n messages added to core.php
  

Location:

trunk/system

Files:

• core/Kohana.php (modified) (2 diffs)
• i18n/en_US/core.php (modified) (1 diff)

trunk/system/core/Kohana.php

@@ -473 +473 @@
                 }
 
-                // Test if display_errors is off
-                if (Config::item('core.display_errors') == FALSE)
-                        return;
-
                 if ($PHP_ERROR)
                 {
@@ -500 +496 @@
                 }
 
-                if ($line != FALSE)
-                {
-                        // Remove the first entry of debug_backtrace(), it is the exception_handler call
-                        $trace = $PHP_ERROR ? array_slice(debug_backtrace(), 1) : $exception->getTrace();
-
-                        // Beautify backtrace
-                        $trace = self::backtrace($trace);
-                }
-
-                // Load the error
-                include self::find_file('views', empty($template) ? 'kohana_error_page' : $template);
+                // Test if display_errors is on
+                if (Config::item('core.display_errors'))
+                {
+                        if ($line != FALSE)
+                        {
+                                // Remove the first entry of debug_backtrace(), it is the exception_handler call
+                                $trace = $PHP_ERROR ? array_slice(debug_backtrace(), 1) : $exception->getTrace();
+
+                                // Beautify backtrace
+                                $trace = self::backtrace($trace);
+                        }
+
+                        // Load the error
+                        include self::find_file('views', empty($template) ? 'kohana_error_page' : $template);
+                }
+                else
+                {
+                        // Get the i18n messages
+                        $error = Kohana::lang('core.generic_error');
+                        $message = sprintf(Kohana::lang('core.errors_disabled'), url::site(''), url::site(Router::$current_uri));
+
+                        // Load the errors_disabled view
+                        include self::find_file('views', 'kohana_error_disabled');
+                }
 
                 // Run the system.shutdown event

trunk/system/i18n/en_US/core.php

@@ -15 +15 @@
         'error_message'         => 'Error occurred at <strong>line %s</strong> of <strong>%s</strong>.',
         'stack_trace'           => 'Stack Trace',
+        'generic_error'         => 'Unable to Complete Request',
+        'errors_disabled'       => 'You can go to the <a href="%s">home page</a> or <a href="%s">try again</a>.',
 
         // Resource names