aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-21 22:56:39 +0200
committerKim Alvefur <zash@zash.se>2015-05-21 22:56:39 +0200
commit7b1c9ac2f7a58d8d91124196fec60206facc840e (patch)
tree2439c11f443bb165c42003bfb5bf7bcbf91924fb
parent516ca9ae842bae50588d38013d42ae5e23a4a39e (diff)
parent1c3f1e910f9be92570e45cd09f5a0063699748c7 (diff)
downloadprosody-7b1c9ac2f7a58d8d91124196fec60206facc840e.tar.gz
prosody-7b1c9ac2f7a58d8d91124196fec60206facc840e.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_storage_sql2.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 8d5d948b..c1030ab0 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -254,7 +254,7 @@ archive_store.caps = {
archive_store.__index = archive_store
function archive_store:append(username, key, value, when, with)
if type(when) ~= "number" then
- value, when, with = when, with, value;
+ when, with, value = value, when, with;
end
local user,store = username,self.store;
return engine:transaction(function()