MDL-16765 - undoing MDL-14303 and adding different fix

mod/glossary/lib.php

@@ -331,7 +331,7 @@ function glossary_get_user_grades($glossary, $userid=0) {
 /**
  * Update grades by firing grade_updated event
  *
- * @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 mean all
  */
 function glossary_update_grades($glossary=null, $userid=0, $nullifnone=true) {
@@ -381,13 +381,8 @@ function glossary_grade_item_update($glossary, $grades=NULL) {
     if (!function_exists('grade_update')) { //workaround for buggy PHP versions
         require_once($CFG->libdir.'/gradelib.php');
     }
-    if(!empty($glossary->cmidnumber)){
-        $params = array('itemname'=>$glossary->name, 'idnumber'=>$glossary->cmidnumber);
-    }else{
-        // MDL-14303
-        $cm = get_coursemodule_from_instance('glossary', $glossary->id);
-        $params = array('itemname'=>$glossary->name, 'idnumber'=>$cm->id);
-    }
+
+    $params = array('itemname'=>$glossary->name, 'idnumber'=>$glossary->cmidnumber);
 
     if (!$glossary->assessed or $glossary->scale == 0) {
         $params['gradetype'] = GRADE_TYPE_NONE;

mod/glossary/rate.php

@@ -28,6 +28,8 @@
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
+    $glossary->cmidnumber = $cm->idnumber;
+
     if (!$glossary->assessed) {
         error("Rating of items not allowed!");
     }