mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
MDL-4421 unwanted space in formatted time; merged from MOODLE_18_STABLE
This commit is contained in:
parent
1545d7f0d4
commit
77ac808e51
@ -966,10 +966,10 @@ function make_timestamp($year, $month=1, $day=1, $hour=0, $minute=0, $second=0,
|
||||
if ($mins) $omins = $mins .' '. $sm;
|
||||
if ($secs) $osecs = $secs .' '. $ss;
|
||||
|
||||
if ($years) return $oyears .' '. $odays;
|
||||
if ($days) return $odays .' '. $ohours;
|
||||
if ($hours) return $ohours .' '. $omins;
|
||||
if ($mins) return $omins .' '. $osecs;
|
||||
if ($years) return trim($oyears .' '. $odays);
|
||||
if ($days) return trim($odays .' '. $ohours);
|
||||
if ($hours) return trim($ohours .' '. $omins);
|
||||
if ($mins) return trim($omins .' '. $osecs);
|
||||
if ($secs) return $osecs;
|
||||
return get_string('now');
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user