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

Conflicts:
	mod/forum/lib.php
This commit is contained in:
Eloy Lafuente (stronk7)
2011-05-25 16:37:43 +02:00
3 changed files with 21 additions and 6 deletions
+7 -2
View File
@@ -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
View File
@@ -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) {
+7 -2
View File
@@ -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) {