mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-34182 AJAX: Change to use shared method when checking the siteadminbranch for invalid output

Browse Source
This commit is contained in:
Andrew Nicols 2013-12-13 11:05:36 +08:00
parent af736f903d
commit f2c780d525
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ajax/getsiteadminbranch.php
View File

@ -40,7 +40,7 @@ if ($branchtype !== navigation_node::TYPE_SITE_ADMIN) {
}
// Start capturing output in case of broken plugins.
ob_start();
ajax_capture_output();
$PAGE->set_context(context_system::instance());
$PAGE->set_url('/lib/ajax/getsiteadminbranch.php', array('type'=>$branchtype));
@ -51,12 +51,5 @@ $sitenavigation = new settings_navigation_ajax($PAGE);
$converter = new navigation_json();
$branch = $sitenavigation->get('root');
$output = ob_get_contents();
ob_end_clean();
if ($CFG->debugdeveloper && !empty($output)) {
throw new coding_exception('Unexpected output whilst building the administration tree. ' .
'This could be caused by trailing whitespace. Output received: ' .
var_export($output, true));
} else {
echo $converter->convert($branch);
}
ajax_check_captured_output();
echo $converter->convert($branch);