Step 2 of Bug 1223 done.

(http://moodle.org/bugs/bug.php?op=show&bugid=1223)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e9862593b754160a69e675537e5c5cd27d8e8013..2401f1c4491f868e99397beeb9b4a20fe1749aad 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2397,6 +2397,51 @@ function make_grades_menu($gradingtype) {
     return $grades;
 }
 
+function course_scale_used($courseid,$scaleid) {
+////This function returns the nummber of activities
+////using scaleid in a courseid
+
+    global $CFG;
+    
+    $return = 0;
+
+    if (!empty($scaleid)) {
+        if ($cms = get_course_mods($courseid)) {
+            foreach ($cms as $cm) {
+                //Check cm->name/lib.php exists
+                if (file_exists($CFG->dirroot.'/mod/'.$cm->modname.'/lib.php')) {
+                    include_once($CFG->dirroot.'/mod/'.$cm->modname.'/lib.php');
+                    $function_name = $cm->modname.'_scale_used';
+                    if (function_exists($function_name)) {
+                        if ($function_name($cm->instance,$scaleid)) {
+                            $return++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return $return;
+}
+
+function site_scale_used($scaleid) {
+////This function returns the nummber of activities 
+////using scaleid in the entire site
+
+    global $CFG;
+
+    $return = 0;
+
+    if (!empty($scaleid)) {
+        if ($courses = get_courses()) {
+            foreach ($courses as $course) {
+                $return += course_scale_used($course->id,$scaleid);
+            }
+        }
+    }
+    return $return;
+}
+
 function make_unique_id_code($extra="") {
 
     $hostname = "unknownhost";

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 36a754040df6c7816739712f131e4f8878283590..a4491001056bb70c392e599526f7f0054e151212 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -384,7 +384,7 @@ function assignment_scale_used ($assignmentid,$scaleid) {
 
     $rec = get_record("assignment","id","$assignmentid","grade","-$scaleid");
 
-    if (!empty($rec)) {
+    if (!empty($rec) && !empty($scaleid)) {
         $return = true;
     }
 

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index d058a2de6f2dd905ac7cfe574b229104f2a285cd..ba778dfafc61bf02cd5ad75368af08f7a71ab4fb 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -591,7 +591,7 @@ function forum_scale_used ($forumid,$scaleid) {
                                  
     $rec = get_record("forum","id","$forumid","scale","-$scaleid");
         
-    if (!empty($rec)) { 
+    if (!empty($rec)  && !empty($scaleid)) { 
         $return = true;
     }
     

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 8ac26c3c713fd0371a6c2ed6864c2a36c952c588..71a40a8b05a8fa4ccaef9ad0efcdf9b83391f60f 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -369,7 +369,7 @@ function glossary_scale_used ($glossaryid,$scaleid) {
 
     $rec = get_record("glossary","id","$glossaryid","scale","-$scaleid");
 
-    if (!empty($rec)) {
+    if (!empty($rec)  && !empty($scaleid)) {
         $return = true;               
     }                            
     

diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index 7e120f1d1772f5bf383dd8fd60cbb87f64e8e5cf..56d78431788c7113d7e9d73881575fd99d065577 100644 (file)
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -299,7 +299,7 @@ function journal_scale_used ($journalid,$scaleid) {
                                  
     $rec = get_record("journal","id","$journalid","assessed","-$scaleid");
 
-    if (!empty($rec)) {
+    if (!empty($rec) && !empty($scaleid)) {
         $return = true;
     }