Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-61482-35' of git://github.com/zig-moodle/moodle int…
…o MOODLE_35_STABLE
  • Loading branch information
David Monllao committed Jun 20, 2018
2 parents 74c35a9 + fd77e38 commit a94b1fe
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions mod/assign/gradingtable.php
Expand Up @@ -1122,11 +1122,10 @@ public function col_allowsubmissionsfromdate(stdClass $row) {

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;

}

/**
Expand All @@ -1140,11 +1139,10 @@ public function col_duedate(stdClass $row) {

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;

}

/**
Expand All @@ -1158,11 +1156,10 @@ public function col_cutoffdate(stdClass $row) {

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;

}

/**
Expand Down

0 comments on commit a94b1fe

Please sign in to comment.