Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:00:00 +0000 (13:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:00:00 +0000 (13:00 +1300)
mod/assignment/lib.php

index 727b64e..99adc60 100644 (file)
@@ -1764,7 +1764,7 @@ class assignment_base {
                 $info->username = fullname($user, true);
                 $info->assignment = format_string($this->assignment->name,true);
                 $info->url = $CFG->wwwroot.'/mod/assignment/submissions.php?id='.$this->cm->id;
-                $info->timeupdated = strftime('%c',$submission->timemodified);
+                $info->timeupdated = userdate($submission->timemodified, '%c', $teacher->timezone);
 
                 $postsubject = $strsubmitted.': '.$info->username.' -> '.$this->assignment->name;
                 $posttext = $this->email_teachers_text($info);