projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
2d89996
)
Merge trunk->0.10
author
Kim Alvefur
<zash@zash.se>
Sun, 6 Mar 2016 17:52:22 +0000
(18:52 +0100)
committer
Kim Alvefur
<zash@zash.se>
Sun, 6 Mar 2016 17:52:22 +0000
(18:52 +0100)
core/storagemanager.lua
patch
|
blob
|
history
diff --git
a/core/storagemanager.lua
b/core/storagemanager.lua
index de68c2ac97fe37ec44d306d480da8bf0e0ae765f..2d6d93f697004cac5b1061683c041a61ff598fd7 100644
(file)
--- 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;