Merge branch 'MDL-61482-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE

This commit is contained in:
David Monllao
2018-06-20 13:29:33 +02:00
+3 -6
View File
@@ -1122,11 +1122,10 @@ class assign_grading_table extends table_sql implements renderable {
if ($row->allowsubmissionsfromdate) {
$userdate = userdate($row->allowsubmissionsfromdate);
$o = $this->output->container($userdate, 'allowsubmissionsfromdate');
$o = ($this->is_downloading()) ? $userdate : $this->output->container($userdate, 'allowsubmissionsfromdate');
}
return $o;
}
/**
@@ -1140,11 +1139,10 @@ class assign_grading_table extends table_sql implements renderable {
if ($row->duedate) {
$userdate = userdate($row->duedate);
$o = $this->output->container($userdate, 'duedate');
$o = ($this->is_downloading()) ? $userdate : $this->output->container($userdate, 'duedate');
}
return $o;
}
/**
@@ -1158,11 +1156,10 @@ class assign_grading_table extends table_sql implements renderable {
if ($row->cutoffdate) {
$userdate = userdate($row->cutoffdate);
$o = $this->output->container($userdate, 'cutoffdate');
$o = ($this->is_downloading()) ? $userdate : $this->output->container($userdate, 'cutoffdate');
}
return $o;
}
/**