Merged changes from main branch up to 2.1.3.

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

diff --git a/includes/errors.inc b/includes/errors.inc
index 1c0f2f97e9108209678d7bd4380afb9c420356f8..566d9f49eddbcdec19e5e1fb0cfecb1a2f95df55 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,12 +17,15 @@ $before_box = ''; // temporary container for output html data before error box
 //    display in message box.
 
 function error_handler($errno, $errstr, $file, $line) {
-    global $messages;
+    global $messages, $go_debug;
 
        // error_reporting==0 when messages are set off with @ 
-       if ($errno & error_reporting()) {
-               $messages[] = array($errno, $errstr, $file, $line);
-       }
+       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: $errstr");
+       
     return true;
 }
 //------------------------------------------------------------------------------
@@ -72,12 +75,18 @@ function error_box() {
     global $before_box;
     
     echo "<div id='msgbox'>";
-    $before_box = ob_get_clean(); // save html content before error box 
+       $before_box = ob_get_clean(); // save html content before error box 
 // Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
-       register_shutdown_function('ob_end_flush');
+       register_shutdown_function('end_flush');
     ob_start('output_html');
     echo "</div>";
 }
+/*
+       Helper to avoid sparse log notices.
+*/
+function end_flush () {
+               if (ob_get_level()) ob_end_flush();
+}
 
 function display_db_error($msg, $sql_statement=null, $exit=true)
 {