moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-31025-m23' of https://github.com/samhemelryk/moodle

Browse source
This commit is contained in:
Aparup Banerjee 2012-01-16 14:40:46 +08:00
commit 9e32834827
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/navigationlib.php
View file

@ -1707,24 +1707,17 @@ class global_navigation extends navigation_node {
/** /**
* Loads all of the activities for a section into the navigation structure. * Loads all of the activities for a section into the navigation structure.
* *
* @todo 2.2 - $activities should always be an array and we should no longer check for it being a
* course_modinfo object
*
* @param navigation_node $sectionnode * @param navigation_node $sectionnode
* @param int $sectionnumber * @param int $sectionnumber
* @param course_modinfo $modinfo Object returned from {@see get_fast_modinfo()} * @param array $activities An array of activites as returned by {@see global_navigation::generate_sections_and_activities()}
* @param stdClass $course The course object the section and activities relate to.
* @return array Array of activity nodes * @return array Array of activity nodes
*/ */
protected function load_section_activities(navigation_node $sectionnode, $sectionnumber, $activities, $course = null) { protected function load_section_activities(navigation_node $sectionnode, $sectionnumber, array $activities, $course = null) {
global $CFG; global $CFG;
// A static counter for JS function naming // A static counter for JS function naming
static $legacyonclickcounter = 0; static $legacyonclickcounter = 0;
if ($activities instanceof course_modinfo) {
debugging('global_navigation::load_section_activities argument 3 should now recieve an array of activites. See that method for an example.', DEBUG_DEVELOPER);
list($sections, $activities) = $this->generate_sections_and_activities($activities->course);
}
$activitynodes = array(); $activitynodes = array();
if (empty($activities)) { if (empty($activities)) {
return $activitynodes; return $activitynodes;