util.pluginloader: Return full file path from internal file loader on success, not...

[prosody.git] / util / datetime.lua

diff --git a/util/datetime.lua b/util/datetime.lua
index 76efc21bffff53431a4bceeb16f5bde8b0e60cc5..301a49a5e9cd60035d4603919428f6192cd1058c 100644 (file)
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -48,7 +48,7 @@ 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;
+                       sec = (sec + time_offset) - tzd_offset;
                        return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec});
                end
        end