Merge branch 'MDL-44061-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Dan Poltawski
2014-03-13 18:33:21 +01:00
committed by Eloy Lafuente (stronk7)
+8 -4
View File
@@ -68,11 +68,15 @@ function ajax_check_captured_output() {
$output = ob_get_contents();
ob_end_clean();
if ($CFG->debugdeveloper && !empty($output)) {
// Only throw an error if the site is in debugdeveloper.
throw new coding_exception('Unexpected output whilst processing AJAX request. ' .
if (!empty($output)) {
$message = 'Unexpected output whilst processing AJAX request. ' .
'This could be caused by trailing whitespace. Output received: ' .
var_export($output, true));
var_export($output, true);
if ($CFG->debugdeveloper && !empty($output)) {
// Only throw an error if the site is in debugdeveloper.
throw new coding_exception($message);
}
error_log('Potential coding error: ' . $message);
}
return $output;
}