Merge branch 'MDL-27625_master' of git://github.com/stronk7/moodle
Conflicts: mod/forum/lib.php
This commit is contained in:
+7
-2
@@ -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) {
|
||||
|
||||
+7
-2
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user