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

Merge branch 'wip-MDL-41222-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2013-08-27 11:03:48 +08:00
parent 5b04c580a1 1afdd452aa
commit abfbffa640
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/modinfolib.php
+5 -9
View File
@@ -244,6 +244,10 @@ class course_modinfo extends stdClass {
public function __construct($course, $userid) {
global $CFG, $DB, $COURSE, $SITE;
if (!isset($course->modinfo) || !isset($course->sectioncache)) {
$course = get_course($course->id, false);
}
// Check modinfo field is set. If not, build and load it.
if (empty($course->modinfo) || empty($course->sectioncache)) {
rebuild_course_cache($course->id);
@@ -1388,7 +1392,7 @@ function get_fast_modinfo($courseorid, $userid = 0, $resetonly = false) {
if (is_object($courseorid)) {
$course = $courseorid;
} else {
$course = (object)array('id' => $courseorid, 'modinfo' => null, 'sectioncache' => null);
$course = (object)array('id' => $courseorid);
}
// Function is called with $reset = true
@@ -1419,14 +1423,6 @@ function get_fast_modinfo($courseorid, $userid = 0, $resetonly = false) {
}
}
if (!property_exists($course, 'modinfo')) {
debugging('Coding problem - missing course modinfo property in get_fast_modinfo() call');
}
if (!property_exists($course, 'sectioncache')) {
debugging('Coding problem - missing course sectioncache property in get_fast_modinfo() call');
}
unset($cache[$course->id]); // prevent potential reference problems when switching users
$cache[$course->id] = new course_modinfo($course, $userid);