Merge branch 'MDL-61482-master' of git://github.com/zig-moodle/moodle

David Monllao · David Monllao · commit 62dc3fde0ae4 · 2018-06-20T13:29:17.000+02:00
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
@@ -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;
-
     }
 
     /**
@@ -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;
-
     }
 
     /**
@@ -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;
-
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1122,11 +1122,10 @@ public function col_allowsubmissionsfromdate(stdClass $row) {`
`1122`	`1122`
`1123`	`1123`	`if ($row->allowsubmissionsfromdate) {`
`1124`	`1124`	`$userdate = userdate($row->allowsubmissionsfromdate);`
`1125`		`- $o = $this->output->container($userdate, 'allowsubmissionsfromdate');`
	`1125`	`+ $o = ($this->is_downloading()) ? $userdate : $this->output->container($userdate, 'allowsubmissionsfromdate');`
`1126`	`1126`	`}`
`1127`	`1127`
`1128`	`1128`	`return $o;`
`1129`		`-`
`1130`	`1129`	`}`
`1131`	`1130`
`1132`	`1131`	`/**`
`@@ -1140,11 +1139,10 @@ public function col_duedate(stdClass $row) {`
`1140`	`1139`
`1141`	`1140`	`if ($row->duedate) {`
`1142`	`1141`	`$userdate = userdate($row->duedate);`
`1143`		`- $o = $this->output->container($userdate, 'duedate');`
	`1142`	`+ $o = ($this->is_downloading()) ? $userdate : $this->output->container($userdate, 'duedate');`
`1144`	`1143`	`}`
`1145`	`1144`
`1146`	`1145`	`return $o;`
`1147`		`-`
`1148`	`1146`	`}`
`1149`	`1147`
`1150`	`1148`	`/**`
`@@ -1158,11 +1156,10 @@ public function col_cutoffdate(stdClass $row) {`
`1158`	`1156`
`1159`	`1157`	`if ($row->cutoffdate) {`
`1160`	`1158`	`$userdate = userdate($row->cutoffdate);`
`1161`		`- $o = $this->output->container($userdate, 'cutoffdate');`
	`1159`	`+ $o = ($this->is_downloading()) ? $userdate : $this->output->container($userdate, 'cutoffdate');`
`1162`	`1160`	`}`
`1163`	`1161`
`1164`	`1162`	`return $o;`
`1165`		`-`
`1166`	`1163`	`}`
`1167`	`1164`
`1168`	`1165`	`/**`