Index: discussion.php =================================================================== RCS file: /cvsroot/moodle/moodle/message/discussion.php,v retrieving revision 1.15.2.3 diff -u -r1.15.2.3 discussion.php --- discussion.php 2 May 2008 04:07:31 -0000 1.15.2.3 +++ discussion.php 2 May 2008 07:40:35 -0000 @@ -199,8 +199,8 @@ if ($messages = get_records_select('message_read', "(useridto = '$USER->id' AND useridfrom = '$userid' AND timeread > '$start' $lastsql) OR (useridto = '$userid' AND useridfrom = '$USER->id' AND timeread > '$start' $lastsql)")) { foreach ($messages as $message) { - $time = userdate($message->timecreated, get_string('strftimedaytime')); - + $time = userdate($message->timecreated, get_string('strftimedatetimeshort')); + if ($message->useridfrom == $USER->id) { $fullname = $mefullname; } else { @@ -223,7 +223,7 @@ if ($messages = get_records_select('message', "useridto = '$userid' AND useridfrom = '$USER->id' $lastsql")) { foreach ($messages as $message) { - $time = userdate($message->timecreated, get_string('strftimedaytime')); + $time = userdate($message->timecreated, get_string('strftimedatetimeshort')); $printmessage = format_text($message->message, $message->format, $options, 0); $printmessage = '
'.$mefullname.' '. @@ -241,7 +241,7 @@ if ($messages = get_records_select('message', "useridto = '$USER->id' AND useridfrom = '$userid' $lastsql")) { foreach ($messages as $message) { - $time = userdate($message->timecreated, get_string('strftimedaytime')); + $time = userdate($message->timecreated, get_string('strftimedatetimeshort')); $printmessage = format_text($message->message, $message->format, $options, 0); $printmessage = '
'.$userfullname.' '. Index: lib.php =================================================================== RCS file: /cvsroot/moodle/moodle/message/lib.php,v retrieving revision 1.61.2.10 diff -u -r1.61.2.10 lib.php --- lib.php 2 May 2008 05:09:41 -0000 1.61.2.10 +++ lib.php 2 May 2008 07:42:30 -0000 @@ -408,7 +408,7 @@ echo "\n"; $blockedcount = 0; - $dateformat = get_string('strftimedatetime'); + $dateformat = get_string('strftimedatetimeshort'); $strcontext = get_string('context', 'message'); foreach ($messages as $message) { @@ -910,7 +910,7 @@ if ($format) { $dateformat = $format; } else { - $format = get_string('strftimedaytime'); + $format = get_string('strftimedatetimeshort'); } } $time = userdate($message->timecreated, $dateformat); Index: refresh.php =================================================================== RCS file: /cvsroot/moodle/moodle/message/refresh.php,v retrieving revision 1.11 diff -u -r1.11 refresh.php --- refresh.php 28 Jan 2007 21:43:39 -0000 1.11 +++ refresh.php 2 May 2008 07:35:24 -0000 @@ -50,7 +50,7 @@ if ($messages = get_records_select('message', "useridto = '$USER->id' AND useridfrom = '$userid'", 'timecreated')) { foreach ($messages as $message) { - $time = userdate($message->timecreated, get_string('strftimedaytime')); + $time = userdate($message->timecreated, get_string('strftimedatetimeshort')); $options = new object(); $options->para = false; Index: send.php =================================================================== RCS file: /cvsroot/moodle/moodle/message/send.php,v retrieving revision 1.22.2.3 diff -u -r1.22.2.3 send.php --- send.php 2 May 2008 04:07:32 -0000 1.22.2.3 +++ send.php 2 May 2008 07:44:15 -0000 @@ -74,7 +74,7 @@ $options->newlines = true; $message = format_text($message, $format, $options); - $time = userdate(time(), get_string('strftimedaytime')); + $time = userdate(time(), get_string('strftimedatetimeshort')); $message = '
'.fullname($USER).' '. '['.$time.']: '. ''.$message.'
';