Merge 0.10->trunk

[prosody.git] / core / storagemanager.lua

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index de68c2ac97fe37ec44d306d480da8bf0e0ae765f..cadae0ed13aac80e518f5f3976ceb1d686694af8 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;
@@ -198,7 +196,7 @@ end
 function datamanager.users(host, datastore, typ)
        local driver = open(host, datastore, typ);
        if not driver.users then
-               return function() log("warn", "storage driver %s does not support listing users", driver.name) end
+               return function() log("warn", "Storage driver %s does not support listing users", driver.name) end
        end
        return driver:users();
 end