Changeset 2249 for trunk/system/core/Kohana.php

Timestamp:

03/09/2008 03:09:43 PM (10 months ago)

Author:

Shadowhand

Message:

Changes to Kohana exception/error handling:

• Added KOHANA_ERROR_CSS to index.php
  
• Updated error pages to use new KOHANA_ERROR_CSS constant
  
• Reflected changes in Kohana and i18n/core.php
  
• Kohana::exeception_handler will no longer include the backtrace when IN_PRODUCTION is enabled, for a small security benefit
  
• Changed index.php directory checks to only execute when IN_PRODUCTION is enabled, for a small performance benefit
  
• Small cleanups in index.php comments
  

Files:

• trunk/system/core/Kohana.php (modified) (2 diffs)

trunk/system/core/Kohana.php

@@ -534 +534 @@
                 if (Config::item('core.display_errors'))
                 {
-                        if ($line != FALSE)
+                        if ( ! IN_PRODUCTION AND $line != FALSE)
                         {
                                 // Remove the first entry of debug_backtrace(), it is the exception_handler call
@@ -1088 +1088 @@
                         if (isset($entry['file']))
                         {
-                                // Add file (without docroot)
-                                $temp .= '<strong>'.preg_replace('!^'.preg_quote(DOCROOT).'!', '', $entry['file']);
-                                // Add line
-                                $temp .= ' ['.$entry['line'].']:</strong>';
+                                $temp .= Kohana::lang('core.error_file_line', preg_replace('!^'.preg_quote(DOCROOT).'!', '', $entry['file']), $entry['line']);
                         }