Commit 5eebbe53 authored by Hugh Davenport's avatar Hugh Davenport Committed by Gerrit Code Review
Browse files

Merge "Bug#1057259 Added year to the post date of forum"

parents 00e34cdf c09f221c
......@@ -1009,7 +1009,7 @@ function relative_date($relative, $absolute, $time1, $time2=null) {
else if ($date['year'] == $today['year'] && $date['yday'] == $today['yday']) {
return str_replace('%v', get_string('today', ''), strftime($relative, $time1));
return strftime($absolute, $time1);
return strftime(get_string('strftimedatetime'), $time1);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment