fixing scale backup/restore

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 38b28c671144703fbbb50a6b03b10d7a32a305ec..886d82ced779fc5bab04d4c4684d9cd6a9a4a3ad 100644 (file)
--- a/backup/restorelib.php
+++ b/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;

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 3a3aea87838219eb4ba04950a825bff30277146b..90b7506a145bed191d829ead545aa16ccb586b95 100644 (file)
--- a/lib/moodlelib.php
+++ b/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;
 }