From df9f4b0f07c9ee93643d97cfb0399da634627a66 Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Wed, 1 Aug 2007 06:24:15 +0000
Subject: [PATCH] fixing scale backup/restore

---
 backup/restorelib.php | 8 +++++++-
 lib/moodlelib.php     | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 38b28c6711..886d82ced7 100644
--- 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 3a3aea8783..90b7506a14 100644
--- 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;
 }
-- 
2.39.5