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

MDL-12945 minor modinfo improvement; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak
2008-01-25 09:39:32 +00:00
parent 1d6608d8db
commit 65a00c975e
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/lib.php
+7 -12
View File
@@ -1007,10 +1007,10 @@ function get_array_of_activities($courseid) {
/**
* Returns reference to full info about modules in course (including visibility).
* Cached and as fast as possible (0 or 1 db query).
* @param $course object or 'reset' string to reset caches
* @param $course object or 'reset' string to reset caches, modinfo may be updated in db
* @return mixed courseinfo object or nothing if resetting
*/
function &get_fast_modinfo($course, $userid=0) {
function &get_fast_modinfo(&$course, $userid=0) {
global $CFG, $USER;
static $cache = array();
@@ -1032,9 +1032,7 @@ function &get_fast_modinfo($course, $userid=0) {
if (empty($course->modinfo)) {
// no modinfo yet - load it
rebuild_course_cache($course->id);
if (!$course = get_record('course', 'id', $course->id)) {
error("Can not find course id: $course->id");
}
$course->modinfo = get_field('course', 'modinfo', 'id', $coure->id);
}
$modinfo = new object();
@@ -1049,9 +1047,7 @@ function &get_fast_modinfo($course, $userid=0) {
if (!is_array($info)) {
// hmm, something is wrong - lets try to fix it
rebuild_course_cache($course->id);
if (!$course = get_record('course', 'id', $course->id)) {
error("Can not find course id: $course->id");
}
$course->modinfo = get_field('course', 'modinfo', 'id', $coure->id);
$info = unserialize($course->modinfo);
if (!is_array($info)) {
return $modinfo;
@@ -1063,9 +1059,7 @@ function &get_fast_modinfo($course, $userid=0) {
$first = reset($info);
if (!isset($first->id)) {
rebuild_course_cache($course->id);
if (!$course = get_record('course', 'id', $course->id)) {
error("Can not find course id: $course->id");
}
$course->modinfo = get_field('course', 'modinfo', 'id', $coure->id);
$info = unserialize($course->modinfo);
if (!is_array($info)) {
return $modinfo;
@@ -1511,7 +1505,8 @@ function rebuild_course_cache($courseid=0) {
}
}
// reset the fast modinfo cache
get_fast_modinfo('reset');
$reset = 'reset';
get_fast_modinfo($reset);
}
function get_child_categories($parent) {
course/view.php
+1 -11
View File
@@ -186,7 +186,7 @@
// Course wrapper start.
echo '<div class="course-content">';
$modinfo =& get_fast_modinfo($course);
get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
if (! $sections = get_all_sections($course->id)) { // No sections found
@@ -202,16 +202,6 @@
}
}
if (empty($course->modinfo)) {
// Course cache was never made.
rebuild_course_cache($course->id);
if (! $course = get_record('course', 'id', $course->id) ) {
error("That's an invalid course id");
}
}
// Include the actual course format.
require($CFG->dirroot .'/course/format/'. $course->format .'/format.php');
// Content wrapper end.