Merged changes form main trunk up to 2.2.4

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

diff --git a/includes/errors.inc b/includes/errors.inc
index a9b68898498fb0e4f9854e678ad155b86a3bfa57..500d7e606ada7e1eb0020d996d1c39e313e2af74 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -94,7 +94,12 @@ function error_box() {
        Helper to avoid sparse log notices.
 */
 function end_flush () {
-               if (ob_get_level()) ob_end_flush();
+       global $Ajax;
+
+       if (isset($Ajax))
+               $Ajax->run();
+
+       if (ob_get_level()) ob_end_flush();
 }
 
 function display_db_error($msg, $sql_statement=null, $exit=true)