aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-06 18:52:22 +0100
committerKim Alvefur <zash@zash.se>2016-03-06 18:52:22 +0100
commit41d0ddcf70e0f04dec8f4fc7e7485b250eeb7d9d (patch)
tree1b515562c7b44102f77bb4fd6ec1f232db3b4ee1 /core
parentdbe8e388f79ec416564fcefe9c6f82cea887a36b (diff)
parentda4afcbab756e737eefb53ddbe18f80b31115276 (diff)
downloadprosody-41d0ddcf70e0f04dec8f4fc7e7485b250eeb7d9d.tar.gz
prosody-41d0ddcf70e0f04dec8f4fc7e7485b250eeb7d9d.zip
Merge trunk->0.10
Diffstat (limited to 'core')
-rw-r--r--core/storagemanager.lua12
1 files changed, 5 insertions, 7 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index de68c2ac..2d6d93f6 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -123,14 +123,12 @@ local map_shim_mt = {
if current == nil then
if err then
return nil, err;
- else
- current = keydatas;
- end
- else
- for k,v in pairs(keydatas) do
- if v == self.remove then v = nil; end
- current[k] = v;
end
+ current = {};
+ end
+ for k,v in pairs(keydatas) do
+ if v == self.remove then v = nil; end
+ current[k] = v;
end
return self.keyval_store:set(username, current);
end;