// error_reporting==0 when messages are set off with @
if ($errno & error_reporting()) {
- $messages[] = array($errno, $errstr, $file, $line, @$bt);
+ // suppress duplicated errors
+ if (!in_array(array($errno, $errstr, $file, $line, @$bt), $messages))
+ $messages[] = array($errno, $errstr, $file, $line, @$bt);
}
else if($errno&~E_NOTICE) { // log all not displayed messages
$user = @$_SESSION["wa_current_user"]->loginname;
// FIX center is unused now
function fmt_errors($center=false) {
global $messages, $path_to_root, $go_debug;
-
+
$msg_class = array(
E_USER_ERROR => 'err_msg',
E_USER_WARNING =>'warn_msg',
$content = ''; // clean other messages
}
}
-
+
$str = $msg[1];
if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $msg[2] != null)
$str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
Helper to avoid sparse log notices.
*/
function end_flush() {
- global $Ajax, $transaction_level;
+ global $Ajax;
if (isset($Ajax))
$Ajax->run();
- // zlib extension adds 1 additional level of buffering
- $min_level = defined('FORCE_GZIP') ? 1 : 0;
-
- // flush all output buffers (works also with exit inside any div levels)
- while(ob_get_level() > $min_level) ob_end_flush();
+ // on some (but not all) php versions zlib extension adds 1 additional level of buffering,
+ // so flush the last buffer outside the loop to be on safe side
+ while(ob_get_level() > 1)
+ ob_end_flush();
+ @ob_end_flush();
// if any transaction was aborted unexpectedly rollback changes
cancel_transaction();