Fixes to usergetdate() ... looks OK now.

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 5c63b760a2425a261c83b34449388b85d7df42ef..366f192fd9f872d67b128f2f0a55eecc247d2b44 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -229,7 +229,19 @@ function usergetdate($date, $timezone=99) {
     if (abs($timezone) > 12) {
         return getdate($date);
     }
-    return getdate($date - (int)($timezone * 3600));
+    //There is no gmgetdate so I have to fake it...
+    $date = $date + (int)($timezone * 3600);
+    $getdate["seconds"] = gmstrftime("%S", $date);
+    $getdate["minutes"] = gmstrftime("%M", $date);
+    $getdate["hours"]   = gmstrftime("%H", $date);
+    $getdate["mday"]    = gmstrftime("%d", $date);
+    $getdate["wday"]    = gmstrftime("%u", $date);
+    $getdate["mon"]     = gmstrftime("%m", $date);
+    $getdate["year"]    = gmstrftime("%Y", $date);
+    $getdate["yday"]    = gmstrftime("%j", $date);
+    $getdate["weekday"] = gmstrftime("%A", $date);
+    $getdate["month"]   = gmstrftime("%B", $date);
+    return $getdate;
 }
 
 function usertime($date, $timezone=99) {
@@ -252,10 +264,6 @@ function usergetmidnight($date, $timezone=99) {
 
     global $USER;
 
-    if ($timezone == 99) {
-        $timezone = (float)$USER->timezone;
-    }
-
     $userdate = usergetdate($date, $timezone);
     $timemidnight = gmmktime (0, 0, 0, $userdate["mon"], $userdate["mday"], $userdate["year"]);
     return usertime($timemidnight, $timezone); // Time of midnight of this user's day, in GMT