mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-16765 - undoing MDL-14303 and adding different fix; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak 2008-10-08 07:16:12 +00:00
parent 1f8abb893b
commit 7f46236fcd
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/glossary/lib.php
View File

@ -345,7 +345,7 @@ function glossary_get_user_grades($glossary, $userid=0) {
/**
* Update activity grades
*
* @param object $glossary null means all glossaries
* @param object $glossary null means all glossaries (with extra cmidnumber property)
* @param int $userid specific user only, 0 means all
*/
function glossary_update_grades($glossary=null, $userid=0, $nullifnone=true) {
@ -410,16 +410,7 @@ function glossary_grade_item_update($glossary, $grades=NULL) {
global $CFG;
require_once($CFG->libdir.'/gradelib.php');
if(!empty($glossary->cmidnumber)){
$params = array('itemname'=>$glossary->name, 'idnumber'=>$glossary->cmidnumber);
}else{
// MDL-14303
if ($cm = get_coursemodule_from_instance('glossary', $glossary->id)) {
$params = array('itemname'=>$glossary->name, 'idnumber'=>$cm->id);
} else {
return false;
}
}
$params = array('itemname'=>$glossary->name, 'idnumber'=>$glossary->cmidnumber);
if (!$glossary->assessed or $glossary->scale == 0) {
$params['gradetype'] = GRADE_TYPE_NONE;

2
mod/glossary/rate.php
View File

@ -28,6 +28,8 @@
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$glossary->cmidnumber = $cm->idnumber;
if (!$glossary->assessed) {
print_error('nopermissiontorate');
}