Merge branch 'MDL-45323-master' of git://github.com/lameze/moodle into MOODLE_27_STABLE

grade/querylib.php

@@ -251,9 +251,9 @@ function grade_get_grade_items_for_activity($cm, $only_main_item=false) {
 
     if (!isset($cm->modname)) {
         $params = array($cm->id);
-        $cm = $DB->get_record_sql("SELECT cm.*, m.name, md.name as modname
+        $cm = $DB->get_record_sql("SELECT cm.*, md.name as modname
                                     FROM {course_modules} cm,
-                                         {modules} md,
+                                         {modules} md
                                    WHERE cm.id = ? AND md.id = cm.module", $params);
     }
 

grade/tests/querylib_test.php

@@ -50,4 +50,15 @@ class core_grade_querylib_testcase extends advanced_testcase {
         $this->assertEquals(1, count($cms));
         $this->assertTrue(isset($cms[$forum1->cmid]));
     }
+
+    public function test_grade_get_grade_items_for_activity() {
+        $this->resetAfterTest(true);
+
+        $course = $this->getDataGenerator()->create_course();
+        $forum = $this->getDataGenerator()->create_module('forum', array('course'=>$course->id));
+        $cm = get_coursemodule_from_id('forum', $forum->cmid, $forum->course);
+        unset($cm->modname);
+        $grade = grade_get_grade_items_for_activity($cm);
+
+    }
 }