Merge branch 'MDL-27625_master' of git://github.com/stronk7/moodle

Conflicts: mod/forum/lib.php
abgreeve · May 25, 2011 · 5b52ce1 · 5b52ce1
2 parents 28e2b08 + 5693d56
commit 5b52ce1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -1444,9 +1444,14 @@ function data_rating_validate($params) {
     }
 
     //check that the submitted rating is valid for the scale
-    if ($params['rating'] < 0) {
+
+    // lower limit
+    if ($params['rating'] < 0  && $params['rating'] != RATING_UNSET_RATING) {
         throw new rating_exception('invalidnum');
-    } else if ($info->scale < 0) {
+    }
+
+    // upper limit
+    if ($info->scale < 0) {
         //its a custom scale
         $scalerecord = $DB->get_record('scale', array('id' => -$info->scale));
         if ($scalerecord) {

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
@@ -3537,9 +3537,14 @@ function forum_rating_validate($params) {
     }
 
     //check that the submitted rating is valid for the scale
-    if ($params['rating'] < 0) {
+
+    // lower limit
+    if ($params['rating'] < 0  && $params['rating'] != RATING_UNSET_RATING) {
         throw new rating_exception('invalidnum');
-    } else if ($forum->scale < 0) {
+    }
+
+    // upper limit
+    if ($info->scale < 0) {
         //its a custom scale
         $scalerecord = $DB->get_record('scale', array('id' => -$forum->scale));
         if ($scalerecord) {

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
@@ -534,9 +534,14 @@ function glossary_rating_validate($params) {
     }
 
     //check that the submitted rating is valid for the scale
-    if ($params['rating'] < 0) {
+
+    // lower limit
+    if ($params['rating'] < 0  && $params['rating'] != RATING_UNSET_RATING) {
         throw new rating_exception('invalidnum');
-    } else if ($info->scale < 0) {
+    }
+
+    // upper limit
+    if ($info->scale < 0) {
         //its a custom scale
         $scalerecord = $DB->get_record('scale', array('id' => -$info->scale));
         if ($scalerecord) {