L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '43675-27' of git://github.com/samhemelryk/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2014-01-20 10:57:30 +08:00
parent fa8861964a 956e2e8a8c
commit c8bfabd267
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ajax/getnavbranch.php
+4 -4
View File
@@ -112,16 +112,16 @@ try {
$html = ob_get_contents();
ob_end_clean();
} catch (Exception $e) {
die('Error: '.$e->getMessage());
throw new coding_exception('Error: '.$e->getMessage());
}
// Check if the buffer contianed anything if it did ERROR!
if (trim($html) !== '') {
die('Errors were encountered while producing the navigation branch'."\n\n\n".$html);
throw new coding_exception('Errors were encountered while producing the navigation branch'."\n\n\n".$html);
}
// Check that branch isn't empty... if it is ERROR!
if (empty($branch) || $branch->nodetype !== navigation_node::NODETYPE_BRANCH) {
die('No further information available for this branch');
if (empty($branch) || ($branch->nodetype !== navigation_node::NODETYPE_BRANCH && !$branch->isexpandable)) {
throw new coding_exception('No further information available for this branch');
}
// Prepare an XML converter for the branch
lib/navigationlib.php
+3
View File
@@ -2748,6 +2748,9 @@ class global_navigation_for_ajax extends global_navigation {
$this->rootnodes['site'] = $this->add_course($SITE);
$this->rootnodes['mycourses'] = $this->add(get_string('mycourses'), new moodle_url('/my'), self::TYPE_ROOTNODE, null, 'mycourses');
$this->rootnodes['courses'] = $this->add(get_string('courses'), null, self::TYPE_ROOTNODE, null, 'courses');
// The courses branch is always displayed, and is always expandable (although may be empty).
// This mimicks what is done during {@link global_navigation::initialise()}.
$this->rootnodes['courses']->isexpandable = true;
// Branchtype will be one of navigation_node::TYPE_*
switch ($this->branchtype) {