mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-24202 navigation Fixed bug caused by navigation overriding a CFG setting

Browse Source
This commit is contained in:
Sam Hemelryk 2011-08-29 13:45:04 +12:00
parent 4ad6128920
commit 9bf5af2181
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/navigationlib.php
View File

@ -937,6 +937,8 @@ class global_navigation extends navigation_node {
protected $rootnodes = array();
/** @var bool */
protected $showemptysections = false;
/** @var bool */
protected $showcategories = null;
/** @var array */
protected $extendforuser = array();
/** @var navigation_cache */
@ -1055,14 +1057,9 @@ class global_navigation extends navigation_node {
$limit = $CFG->navcourselimit;
}
if (!empty($CFG->navshowcategories) && $DB->count_records('course_categories') == 1) {
// There is only one category so we don't want to show categories
$CFG->navshowcategories = false;
}
$mycourses = enrol_get_my_courses(NULL, 'visible DESC,sortorder ASC', $limit);
$showallcourses = (count($mycourses) == 0 || !empty($CFG->navshowallcourses));
$showcategories = ($showallcourses && !empty($CFG->navshowcategories));
$showcategories = ($showallcourses && $this->show_categories());
$issite = ($this->page->course->id != SITEID);
$ismycourse = (array_key_exists($this->page->course->id, $mycourses));
@ -1315,6 +1312,20 @@ class global_navigation extends navigation_node {
}
return true;
}
/**
* Returns true is courses should be shown within categories on the navigation.
*
* @return bool
*/
protected function show_categories() {
global $CFG, $DB;
if ($this->showcategories === null) {
$this->showcategories = !empty($CFG->navshowcategories) && $DB->count_records('course_categories') > 1;
}
return $this->showcategories;
}
/**
* Checks the course format to see whether it wants the navigation to load
* additional information for the course.
@ -2154,7 +2165,7 @@ class global_navigation extends navigation_node {
}
if (!$ismycourse && !$issite && !empty($course->category)) {
if (!empty($CFG->navshowcategories)) {
if ($this->show_categories()) {
// We need to load the category structure for this course
$this->load_all_categories($course->category);
}