Added system tale for transaction edition entry points.

[fa-stable.git] / includes / errors.inc

diff --git a/includes/errors.inc b/includes/errors.inc
index c584d175f79e831d3855d0fb672910e55c8df844..7654ba70e676320c24f1ea088bfc83293f97f814 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -21,7 +21,10 @@ function error_handler($errno, $errstr, $file, $line) {
 
        // skip well known warnings we don't care about.
        // Please use restrainedly to not risk loss of important messages
-       $excluded_warnings = array('html_entity_decode', 'htmlspecialchars');
+       $excluded_warnings = array(
+               'html_entity_decode', 'htmlspecialchars',       // nevermind encodings, special chars are processed anyway
+               'should be compatible with that'                        // ignore cpdf/frontreport wrapper warnings
+       );
        foreach($excluded_warnings as $ref) {
                if (strpos($errstr, $ref) !== false) {
                        return true;
@@ -29,12 +32,14 @@ function error_handler($errno, $errstr, $file, $line) {
        }
        
        // error_reporting==0 when messages are set off with @ 
-       if ($errno & error_reporting())
-                       $messages[] = array($errno, $errstr, $file, $line);
-       else if($errno&~E_NOTICE)// log all not displayed messages 
-               error_log(user_company() . ':' . $_SESSION["wa_current_user"]->loginname.':'
-                        . basename($file) .":$line:" . ( $SysPrefs->db_ok ? '':'[before upgrade]')
-                        . " $errstr");
+       if ($errno & error_reporting()) {
+               $messages[] = array($errno, $errstr, $file, $line);
+       }
+       else if($errno&~E_NOTICE) { // log all not displayed messages 
+               $user = @$_SESSION["wa_current_user"]->loginname;
+               $context = isset($SysPrefs) && !$SysPrefs->db_ok ? '[before upgrade]' : '';
+               error_log(user_company() . ":$user:". basename($file) .":$line:$context $errstr");
+       }
        
     return true;
 }
@@ -130,7 +135,7 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
                $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
 
                $str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."<br>";
-               if ($go_debug > 1) display_backtrace();
+//             if ($go_debug > 1) display_backtrace();
        }
        
        $str .= "<br><br>";