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

MDL-21590 fixed icons in navigation lib + clean up of modinfo (planned removeal of legacy use of urlencode since 1.8 - we use serialize and utf8 is ok now)

Browse Source
This commit is contained in:
Petr Skoda
2010-02-14 20:18:10 +00:00
parent 5bb3ef7388
commit 9a9012dc8f
15 changed files with 62 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+7 -7
View File
@@ -2809,7 +2809,7 @@ function &get_fast_modinfo(&$course, $userid=0) {
$cm->instance = $mod->id;
$cm->course = $course->id;
$cm->modname = $mod->mod;
$cm->name = urldecode($mod->name);
$cm->name = $mod->name;
$cm->visible = $mod->visible;
$cm->sectionnum = $mod->section;
$cm->groupmode = $mod->groupmode;
@@ -2817,8 +2817,9 @@ function &get_fast_modinfo(&$course, $userid=0) {
$cm->groupmembersonly = $mod->groupmembersonly;
$cm->indent = $mod->indent;
$cm->completion = $mod->completion;
$cm->extra = isset($mod->extra) ? urldecode($mod->extra) : '';
$cm->extra = isset($mod->extra) ? $mod->extra : '';
$cm->icon = isset($mod->icon) ? $mod->icon : '';
$cm->iconcomponent = isset($mod->iconcomponent) ? $mod->iconcomponent : '';
$cm->uservisible = true;
if(!empty($CFG->enableavailability)) {
// We must have completion information from modinfo. If it's not
@@ -2855,17 +2856,16 @@ function &get_fast_modinfo(&$course, $userid=0) {
$minimalmodinfo=new stdClass();
$minimalmodinfo->cms=array();
foreach($info as $mod) {
$minimalcm=new stdClass();
$minimalcm->id=$mod->cm;
$minimalcm->name=urldecode($mod->name);
$minimalcm = new stdClass();
$minimalcm->id = $mod->cm;
$minimalcm->name = $mod->name;
$minimalmodinfo->cms[$minimalcm->id]=$minimalcm;
}
}
// Get availability information
$ci = new condition_info($cm);
$cm->available=$ci->is_available($cm->availableinfo,true,$userid,
$minimalmodinfo);
$cm->available=$ci->is_available($cm->availableinfo, true, $userid, $minimalmodinfo);
} else {
$cm->available=true;
}