Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-32234 Library: usergetdate return different values when timezone …

…is set

usergetdate should return consistent values for different timezone. There are
two return path
1. If timezone is servertime, it returns getdate
2. If timezone other then servertime, it use gmstrftime, which returns string and
   values with leading zero.
In second case, leading zero's are removed and values are type casted. One major fix
is with yday, getdate returns 0 through 365, whereas %j returns 001 through 366. This
has been fixed as well.
  • Loading branch information...
commit 7cdb2e45757e4cffe48d067628107220808a00d3 1 parent eddceb6
Rajesh Taneja rajeshtaneja authored
Showing with 11 additions and 2 deletions.
  1. +9 −0 lib/moodlelib.php
  2. +2 −2 lib/simpletest/testmoodlelib.php
9 lib/moodlelib.php
View
@@ -1798,6 +1798,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;
}
4 lib/simpletest/testmoodlelib.php
View
@@ -580,7 +580,7 @@ function test_usergetdate() {
$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');
@@ -595,7 +595,7 @@ function test_usergetdate() {
$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');
Please sign in to comment.
Something went wrong with that request. Please try again.