Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-27625 rating - consider RATING_UNSET_RATING a valid rating value

  • Loading branch information...
commit 5693d56cd80ac4dbd0ceda548b3b6e0bc9c48cd2 1 parent d04f7fb
@stronk7 stronk7 authored
Showing with 21 additions and 6 deletions.
  1. +7 −2 mod/data/lib.php
  2. +7 −2 mod/forum/lib.php
  3. +7 −2 mod/glossary/lib.php
View
9 mod/data/lib.php
@@ -1420,9 +1420,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' => -$params['scaleid']));
if ($scalerecord) {
View
9 mod/forum/lib.php
@@ -3513,9 +3513,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 ($info->scale < 0) {
+ }
+
+ // upper limit
+ if ($info->scale < 0) {
//its a custom scale
$scalerecord = $DB->get_record('scale', array('id' => -$params['scaleid']));
if ($scalerecord) {
View
9 mod/glossary/lib.php
@@ -526,9 +526,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' => -$params['scaleid']));
if ($scalerecord) {
Please sign in to comment.
Something went wrong with that request. Please try again.