diff options
| author | Kim Alvefur <zash@zash.se> | 2014-06-21 15:05:52 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-06-21 15:05:52 +0200 |
| commit | 9c0da6a29b9d6260909c84f02355488dbd4e414d (patch) | |
| tree | b2f59bdc9faeaf18b51e6b13f3b78a625c8a7510 /plugins/mod_storage_sql2.lua | |
| parent | 3f4c83225b50777da921a2a11aac6d07296b2b8c (diff) | |
| parent | 0226460cacd55adf96cb46f57f6a010181f445c5 (diff) | |
| download | prosody-9c0da6a29b9d6260909c84f02355488dbd4e414d.tar.gz prosody-9c0da6a29b9d6260909c84f02355488dbd4e414d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_sql2.lua')
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index 249c72a7..0531c905 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -198,7 +198,9 @@ local keyval_store = {}; keyval_store.__index = keyval_store; function keyval_store:get(username) user,store = username,self.store; - return select(2, engine:transaction(keyval_store_get)); + local ok, result = engine:transaction(keyval_store_get); + if not ok then return ok, result; end + return result; end function keyval_store:set(username, data) user,store = username,self.store; |