Merge branch 'MDL-57020-39-allow_delete_unused_scale' of https://github.com/sharidas/moodle into MOODLE_39_STABLE

lib/grade/tests/grade_scale_test.php

@@ -167,5 +167,10 @@ class core_grade_scale_testcase extends grade_base_testcase {
         $this->assertNotEmpty($grade_item->id);
         $this->assertEquals(1, $grade_item->grademin);
         $this->assertEquals(1, $grade_item->grademax);
+
+        $status = $scale->is_used();
+
+        $this->assertTrue($status);
+
     }
 }

mod/forum/lib.php

@@ -954,7 +954,7 @@ function forum_scale_used_anywhere(int $scaleid): bool {
         return false;
     }
 
-    return $DB->record_exists('forum', ['scale' => $scaleid * -1]);
+    return $DB->record_exists_select('forum', "scale = ? and assessed > 0", [$scaleid * -1]);
 }
 
 // SQL FUNCTIONS ///////////////////////////////////////////////////////////

mod/glossary/lib.php

@@ -877,7 +877,7 @@ function glossary_scale_used() {
 function glossary_scale_used_anywhere($scaleid) {
     global $DB;
 
-    if ($scaleid and $DB->record_exists('glossary', array('scale'=>-$scaleid))) {
+    if ($scaleid and $DB->record_exists_select('glossary', "scale = ? and assessed > 0", [-$scaleid])) {
         return true;
     } else {
         return false;