Changeset 4578 for trunk/core/errorhandler.core.php

Timestamp:

08/15/10 18:45:12 (22 months ago)

Author:

vain

Message:

• several changes to copyright, router, bootstrap, frontcontroller and various other files

File:

• trunk/core/errorhandler.core.php (modified) (5 diffs)

trunk/core/errorhandler.core.php

@@ -24 +24 @@
     *
     * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE".
-    *
     * @author     Jens-André Koch <vain@clansuite.com>
     * @copyright  Jens-André Koch (2005 - onwards)
-    *
     * @link       http://www.clansuite.com
-    * @link       http://gna.org/projects/clansuite
     *
     * @version    SVN: $Id$
@@ -158 +155 @@
         {
             # SMARTY ERRORS are thrown by trigger_error() - so they bubble up as E_USER_ERROR
-            # so in order to handle smarty errors with a seperated error display
+            # and in order to handle smarty errors with a seperated error display
             # we need to detect, if an E_USER_ERROR is incoming from SMARTY or from a template_c file (extension tpl.php)
             if( (mb_strpos(mb_strtolower($errorfile),'smarty') == true) or (mb_strpos(mb_strtolower($errorfile),'tpl.php') == true) )
@@ -459 +456 @@
             }
 
-            $backtrace_string .= '<tr><td><strong>File: </strong></td><td>' . $backtrace[$i]['file'] . '</td></tr>';
-            $backtrace_string .= '<tr><td><strong>Line: </strong></td><td>' . $backtrace[$i]['line'] . '</td></tr>';
+            if(isset($backtrace[$i]['file']))
+            {
+                $backtrace_string .= '<tr><td><strong>File: </strong></td><td>' . $backtrace[$i]['file'] . '</td></tr>';
+                $backtrace_string .= '<tr><td><strong>Line: </strong></td><td>' . $backtrace[$i]['line'] . '</td></tr>';
+            }
 
             # spacer
@@ -473 +473 @@
      * formatBacktraceArgument
      *
-     * performs a type check on an backtrace argument and formats it nicely
+     * Performs a type check on the backtrace argument and beautifies it.
      *
      * This formater is based on comments for debug-backtrace in the php manual
@@ -507 +507 @@
             case 'string':
                 $args .= '<span>string</span> ';
-                $backtraceArgument = htmlspecialchars(mb_substr($backtraceArgument, 0, 64));
                 if((mb_strlen($backtraceArgument) > 64))
                 {
+                    $backtraceArgument = htmlspecialchars(mb_substr($backtraceArgument, 0, 64));
                     $backtraceArgument . '...';
                 }