Software / code / prosody
Changeset
7245:210d8329dc70
Merge trunk->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 06 Mar 2016 18:52:22 +0100 |
| parents | 7243:6e6eea2124c5 (current diff) 7244:8c6943918279 (diff) |
| children | 7246:80923a1a8fe1 7247:44b39c02eb33 |
| files | core/storagemanager.lua |
| diffstat | 1 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/core/storagemanager.lua Sat Mar 05 23:44:57 2016 +0000 +++ b/core/storagemanager.lua Sun Mar 06 18:52:22 2016 +0100 @@ -123,14 +123,12 @@ 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;
