fixing scale backup/restore

backup/restorelib.php

@@ -2321,7 +2321,13 @@
                         } else {
                             $course_to_search = $restore->course_id;
                         }
-                        $sca_db = get_record("scale","scale",$sca->scale,"courseid",$course_to_search);
+                        
+                        // scale is not course unique, use get_record_sql to suppress warning
+                        
+                        $sca_db = get_record_sql("SELECT * FROM {$CFG->prefix}scale
+                                                           WHERE scale = '$sca->scale'
+                                                           AND courseid = $course_to_search", true);                  
+                        
                         //If it doesn't exist, create
                         if (!$sca_db) {
                             $create_scale = true;

lib/moodlelib.php

@@ -6033,6 +6033,9 @@ function course_scale_used($courseid, $scaleid) {
                 }
             }
         }
+        
+        // check if any course grade item makes use of the scale
+        $return += count_records('grade_items', 'courseid', $courseid, 'scaleid', $scaleid);                            
     }
     return $return;
 }