diff plugins/mod_storage_sql2.lua @ 6285:ea60d0441df7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 21 Jun 2014 15:05:52 +0200
parents bce801e40484
children fc5113a4540e a966efeb6cb3
line wrap: on
line diff
--- a/plugins/mod_storage_sql2.lua	Tue Jun 17 15:27:00 2014 -0400
+++ b/plugins/mod_storage_sql2.lua	Sat Jun 21 15:05:52 2014 +0200
@@ -198,7 +198,9 @@
 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;