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 | 2d5b25a9375156bba8b3ffa97a95b9cb2fe35a9d (patch) | |
| tree | b2f59bdc9faeaf18b51e6b13f3b78a625c8a7510 /plugins/mod_storage_sql2.lua | |
| parent | 3a09673e61b5d394fcade54e8e09dadcc840fdb0 (diff) | |
| parent | 265b49cc49438767327fc3468561a4fbcf484fe0 (diff) | |
| download | prosody-2d5b25a9375156bba8b3ffa97a95b9cb2fe35a9d.tar.gz prosody-2d5b25a9375156bba8b3ffa97a95b9cb2fe35a9d.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; |