mod_adhoc: Add support for commands only executable by global administrators

[prosody.git] / util / datetime.lua

diff --git a/util/datetime.lua b/util/datetime.lua
index 76efc21bffff53431a4bceeb16f5bde8b0e60cc5..c73d8e761a3c86db120119f7670082ec487f82be 100644 (file)
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -48,8 +48,8 @@ function parse(s)
                                tzd_offset = h * 60 * 60 + m * 60;
                                if sign == "-" then tzd_offset = -tzd_offset; end
                        end
-                       sec = sec + time_offset + tzd_offset;
-                       return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec});
+                       sec = (sec + time_offset) - tzd_offset;
+                       return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec, isdst=false});
                end
        end
 end