projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup
[fa-stable.git]
/
includes
/
errors.inc
diff --git
a/includes/errors.inc
b/includes/errors.inc
index fc8f4fb692fca3205b277009755fd70291cf90df..16b5be40f4c59c254af75cb26ac2367a77157383 100644
(file)
--- a/
includes/errors.inc
+++ b/
includes/errors.inc
@@
-85,27
+85,30
@@
function error_box() {
global $before_box;
echo "<div id='msgbox'>";
global $before_box;
echo "<div id='msgbox'>";
- $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
// Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
- register_shutdown_function('end_flush');
+ $before_box = ob_get_clean(); // save html content before error box
ob_start('output_html');
echo "</div>";
}
/*
Helper to avoid sparse log notices.
*/
ob_start('output_html');
echo "</div>";
}
/*
Helper to avoid sparse log notices.
*/
-function end_flush
() {
- global $Ajax;
+function end_flush() {
+ global $Ajax
, $transaction_level
;
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();
- if (ob_get_level()) ob_end_flush();
+ // if any transaction was aborted unexpectedly rollback changes
+ cancel_transaction();
}
function display_db_error($msg, $sql_statement=null, $exit=true)
{
}
function display_db_error($msg, $sql_statement=null, $exit=true)
{
- global $db, $debug;
+ global $db, $debug
, $go_debug
;
$warning = $msg==null;
$db_error = db_error_no();
$warning = $msg==null;
$db_error = db_error_no();
@@
-125,6
+128,7
@@
function display_db_error($msg, $sql_statement=null, $exit=true)
if ($debug == 1)
{
$str .= "sql that failed was : " . $sql_statement . "<br>";
if ($debug == 1)
{
$str .= "sql that failed was : " . $sql_statement . "<br>";
+ if ($go_debug > 1) display_backtrace();
}
$str .= "<br><br>";
}
$str .= "<br><br>";