Possible fix for 'ob_end_clean: failed to delete buffer. No buffer to delete.'

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 5bc89a05f366da844c18161cb7be874616a5460b..a6f08285da2b4ec7c151616aa68971f0ff8fcf87 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -117,7 +117,7 @@ function writeToFile ($FQFN, $content, $aquireLock = false) {
 // Clears the output buffer. This function does *NOT* backup sent content.
 function clearOutputBuffer () {
        // Trigger an error on failure
-       if (!ob_end_clean()) {
+       if ((ob_get_length() > 0) && (!ob_end_clean())) {
                // Failed!
                debug_report_bug(__FUNCTION__.': Failed to clean output buffer.');
        } // END - if
@@ -722,7 +722,7 @@ function isExtensionInstalledAndNewer ($ext_name, $version) {
        }
 
        // Return it
-       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'=&gt;'.$version.':'.intval($GLOBALS['ext_installed_newer'][$ext_name][$version]).'<br />';
+       //* DEBUG: */ debugOutput(__FUNCTION__.':'.$ext_name.'=&gt;'.$version.':'.intval($GLOBALS['ext_installed_newer'][$ext_name][$version]));
        return $GLOBALS['ext_installed_newer'][$ext_name][$version];
 }
 
@@ -737,7 +737,7 @@ function isExtensionInstalledAndOlder ($ext_name, $version) {
        }
 
        // Return it
-       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'&lt;'.$version.':'.intval($GLOBALS['ext_installed_older'][$ext_name][$version]).'<br />';
+       //* DEBUG: */ debugOutput(__FUNCTION__.':'.$ext_name.'&lt;'.$version.':'.intval($GLOBALS['ext_installed_older'][$ext_name][$version]));
        return $GLOBALS['ext_installed_older'][$ext_name][$version];
 }
 
@@ -1044,5 +1044,10 @@ function getTotalConfirmedUser () {
        return $GLOBALS['total_confirmed_users'];
 }
 
+// Wrapper for writing debug informations to the browser
+function debugOutput ($message) {
+       outputHtml('<div class="debug_message">' . $message . '</div>');
+}
+
 // [EOF]
 ?>