projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New mysql/mysqli driver implemented. Uses mysqli driver from php version 5.5.
[fa-stable.git]
/
includes
/
errors.inc
diff --git
a/includes/errors.inc
b/includes/errors.inc
index 89aae72fe29f2e1570b70fb904b39927ddad5d8a..8b02f299148413e691d530427361fcc3a0567fef 100644
(file)
--- a/
includes/errors.inc
+++ b/
includes/errors.inc
@@
-76,7
+76,9
@@
function error_handler($errno, $errstr, $file, $line) {
// error_reporting==0 when messages are set off with @
if ($errno & error_reporting()) {
// 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;
}
else if($errno&~E_NOTICE) { // log all not displayed messages
$user = @$_SESSION["wa_current_user"]->loginname;
@@
-117,6
+119,7
@@
function fmt_errors($center=false) {
$content = ''; // clean other messages
}
}
$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];
$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];
@@
-149,12
+152,16
@@
function error_box() {
Helper to avoid sparse log notices.
*/
function end_flush() {
Helper to avoid sparse log notices.
*/
function end_flush() {
- global $Ajax
, $transaction_level
;
+ global $Ajax;
if (isset($Ajax))
$Ajax->run();
if (isset($Ajax))
$Ajax->run();
- // flush all output buffers (works also with exit inside any div levels)
- while(ob_get_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();
// if any transaction was aborted unexpectedly rollback changes
cancel_transaction();