diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 2812280894c..f6f4dabc149 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -2039,6 +2039,15 @@ function usergetdate($time, $timezone=99) { $getdate['seconds'] ) = explode('_', $datestring); + // set correct datatype to match with getdate() + $getdate['seconds'] = (int)$getdate['seconds']; + $getdate['yday'] = (int)$getdate['yday'] - 1; // gettime returns 0 through 365 + $getdate['year'] = (int)$getdate['year']; + $getdate['mon'] = (int)$getdate['mon']; + $getdate['wday'] = (int)$getdate['wday']; + $getdate['mday'] = (int)$getdate['mday']; + $getdate['hours'] = (int)$getdate['hours']; + $getdate['minutes'] = (int)$getdate['minutes']; return $getdate; } diff --git a/lib/simpletest/testmoodlelib.php b/lib/simpletest/testmoodlelib.php index 30d921c4bf6..a2f47c85552 100644 --- a/lib/simpletest/testmoodlelib.php +++ b/lib/simpletest/testmoodlelib.php @@ -1028,7 +1028,7 @@ class moodlelib_test extends UnitTestCase { $this->assertEqual($wday,3); $this->assertEqual($mon,12); $this->assertEqual($year,2009); - $this->assertEqual($yday,357); + $this->assertEqual($yday,356); $this->assertEqual($weekday, 'Wednesday'); $this->assertEqual($month, 'December'); @@ -1043,7 +1043,7 @@ class moodlelib_test extends UnitTestCase { $this->assertEqual($wday,3); $this->assertEqual($mon,12); $this->assertEqual($year,2009); - $this->assertEqual($yday,357); + $this->assertEqual($yday,356); $this->assertEqual($weekday, 'Wednesday'); $this->assertEqual($month, 'December');