MDL-9516 fixed mod_form.php logic + related lib issues

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 29760055f4e11f3ba225e7b4a61a75105b0d2af1..f6c4c65f6e64ab782d51c6ac411a2c7d3123a6bc 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1219,7 +1219,7 @@ function forum_grade_item_update($forum) {
     $grade_item->name       = $forum->name;
     $grade_item->idnumber = $forum->cmidnumber;
 
-    if (!$forum->assessed) {
+    if (!$forum->assessed or $forum->scale == 0) {
         //how to indicate no grading?
         $grade_item->gradetype = GRADE_TYPE_TEXT;
 
@@ -1250,7 +1250,7 @@ function forum_grade_item_create($forum) {
                     'itemname'    =>$forum->name,
                     'idnumber'    =>$forum->cmidnumber);
 
-    if (!$forum->assessed) {
+    if (!$forum->assessed or $forum->scale == 0) {
         //how to indicate no grading?
         $params['gradetype'] = GRADE_TYPE_TEXT;
 

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 3515df3ba57fa0e07ae92dc89bba11609a5b4df3..3060e67f1d599ddbdec49d9d0bad81b44b2206fb 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -420,7 +420,7 @@ function glossary_grade_item_update($glossary) {
     $grade_item->name     = $glossary->name;
     $grade_item->idnumber = $glossary->cmidnumber;
 
-    if (!$glossary->assessed) {
+    if (!$glossary->assessed or $glossary->scale == 0) {
         //how to indicate no grading?
         $grade_item->gradetype = GRADE_TYPE_TEXT;
 
@@ -451,7 +451,7 @@ function glossary_grade_item_create($glossary) {
                     'itemname'    =>$glossary->name,
                     'idnumber'    =>$glossary->cmidnumber);
 
-    if (!$glossary->assessed) {
+    if (!$glossary->assessed or $glossary->scale == 0) {
         //how to indicate no grading?
         $params['gradetype'] = GRADE_TYPE_TEXT;