From 77ac808e5151a21837c02f69206cf265f2098e61 Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 16 Apr 2007 18:51:52 +0000 Subject: [PATCH] MDL-4421 unwanted space in formatted time; merged from MOODLE_18_STABLE --- lib/moodlelib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index d5bc8dc5374..4cb346d8f07 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -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'); }