Commit 0246241b authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "format_date function returns false (Bug #1670885)"

parents a63b859e e707353a
......@@ -2458,6 +2458,7 @@ function format_date($date, $formatkey='strftimedatetime', $notspecifiedkey='str
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
$fixedkey = str_replace('%e', '%#d', get_string($formatkey));
$fixedkey = str_replace('%l', '%#I', $fixedkey);
return strftime($fixedkey, $date);
return strftime(get_string($formatkey), $date);
Supports Markdown
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