From: moodler <moodler>
Date: Mon, 13 Jan 2003 02:42:57 +0000 (+0000)
Subject: Slightly more robust function
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=94e3411897ee97eddb98a0cb5e006990b71f0f2a;p=moodle.git

Slightly more robust function
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 5b7672d1ab..7d96ddd0b3 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -70,7 +70,13 @@ function set_config($name, $value) {
 function make_timestamp($year, $month=1, $day=1, $hour=0, $minute=0, $second=0, $timezone=99) {
 /// Given date parts in user time, produce a GMT timestamp
 
+    global $USER;
+
     if ($timezone == 99) {
+        $timezone = (float)$USER->timezone;
+    }
+
+    if (abs($timezone) > 13) {
         return mktime((int)$hour,(int)$minute,(int)$second,(int)$month,(int)$day,(int)$year);
     } else {
         $time = gmmktime((int)$hour,(int)$minute,(int)$second,(int)$month,(int)$day,(int)$year);