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
commit20b57f7f016e907cf3d89793f5c57aaeff0b630f (patch)
tree2439c11f443bb165c42003bfb5bf7bcbf91924fb
parent022944ecc4e5d4d8ece338f05eb8fe4366c11155 (diff)
parentf4b4f1020ae91754d915d296749510031e7c784c (diff)
downloadprosody-20b57f7f016e907cf3d89793f5c57aaeff0b630f.tar.gz
prosody-20b57f7f016e907cf3d89793f5c57aaeff0b630f.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()