Fix for bug 2584:
All floatval() calls changed to (float) casts.
This commit is contained in:
@@ -128,7 +128,7 @@ class block_quiz_results extends block_base {
|
||||
// Count this result only if the user is in a group
|
||||
$groupid = $groupofuser[$grade->userid]->groupid;
|
||||
if(!isset($groupgrades[$groupid])) {
|
||||
$groupgrades[$groupid] = array('sum' => floatval($grade->grade), 'number' => 1, 'group' => $groupofuser[$grade->userid]->name);
|
||||
$groupgrades[$groupid] = array('sum' => (float)$grade->grade, 'number' => 1, 'group' => $groupofuser[$grade->userid]->name);
|
||||
}
|
||||
else {
|
||||
$groupgrades[$groupid]['sum'] += $grade->grade;
|
||||
@@ -187,7 +187,7 @@ class block_quiz_results extends block_base {
|
||||
break;
|
||||
default:
|
||||
case GRADE_FORMAT_PCT:
|
||||
$this->content->text .= round(floatval($averagegrade) / floatval($quiz->grade) * 100).'%';
|
||||
$this->content->text .= round((float)$averagegrade / (float)$quiz->grade * 100).'%';
|
||||
break;
|
||||
}
|
||||
$this->content->text .= '</td></tr>';
|
||||
@@ -212,7 +212,7 @@ class block_quiz_results extends block_base {
|
||||
break;
|
||||
default:
|
||||
case GRADE_FORMAT_PCT:
|
||||
$this->content->text .= round(floatval($averagegrade) / floatval($quiz->grade) * 100).'%';
|
||||
$this->content->text .= round((float)$averagegrade / (float)$quiz->grade * 100).'%';
|
||||
break;
|
||||
}
|
||||
$this->content->text .= '</td></tr>';
|
||||
@@ -299,7 +299,7 @@ class block_quiz_results extends block_base {
|
||||
break;
|
||||
default:
|
||||
case GRADE_FORMAT_PCT:
|
||||
$this->content->text .= round(floatval($grades[$gradeid]->grade) / floatval($quiz->grade) * 100).'%';
|
||||
$this->content->text .= round((float)$grades[$gradeid]->grade / (float)$quiz->grade * 100).'%';
|
||||
break;
|
||||
}
|
||||
$this->content->text .= '</td></tr>';
|
||||
@@ -324,7 +324,7 @@ class block_quiz_results extends block_base {
|
||||
break;
|
||||
default:
|
||||
case GRADE_FORMAT_PCT:
|
||||
$this->content->text .= round(floatval($grades[$gradeid]->grade) / floatval($quiz->grade) * 100).'%';
|
||||
$this->content->text .= round((float)$grades[$gradeid]->grade / (float)$quiz->grade * 100).'%';
|
||||
break;
|
||||
}
|
||||
$this->content->text .= '</td></tr>';
|
||||
|
||||
+4
-4
@@ -694,10 +694,10 @@ function userdate($date, $format='', $timezone=99, $fixday = true) {
|
||||
|
||||
$date += dst_offset_on($date);
|
||||
if (abs($timezone) > 13) {
|
||||
$date += intval(date('O') * HOURSECS);
|
||||
$date += intval((float)date('O') * HOURSECS);
|
||||
}
|
||||
else {
|
||||
$date += intval($timezone * HOURSECS);
|
||||
$date += intval((float)$timezone * HOURSECS);
|
||||
}
|
||||
|
||||
if ($fixday) {
|
||||
@@ -728,10 +728,10 @@ function usergetdate($time, $timezone=99) {
|
||||
$time += dst_offset_on($time);
|
||||
|
||||
if (abs($timezone) > 13) {
|
||||
$time += floatval(date('O')) * HOURSECS;
|
||||
$time += intval((float)(date('O')) * HOURSECS;
|
||||
}
|
||||
else {
|
||||
$time += floatval($timezone) * HOURSECS;
|
||||
$time += intval((float)($timezone) * HOURSECS;
|
||||
}
|
||||
|
||||
// This is independent of the server's TZ settings,
|
||||
|
||||
+1
-1
@@ -220,7 +220,7 @@ function quiz_user_outline($course, $user, $mod, $quiz) {
|
||||
/// $return->info = a short text description
|
||||
if ($grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) {
|
||||
|
||||
if (floatval($grade->grade)) {
|
||||
if ((float)$grade->grade) {
|
||||
$result->info = get_string('grade').': '.format_float($grade->grade, $quiz->decimalpoints);
|
||||
}
|
||||
$result->time = $grade->timemodified;
|
||||
|
||||
Reference in New Issue
Block a user