diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-23 15:14:47 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-23 15:14:47 +0100 |
| commit | 106f5079b664a9ceacb77242891e42fa7425115a (patch) | |
| tree | c9352f3197224088a16296c217e43ec770b21177 /core | |
| parent | 5d47f4cd480305344b4fbc71c1cf942706444f31 (diff) | |
| parent | 3b59eb2735ad49245ecf539f65b9fd195a15d4c5 (diff) | |
| download | prosody-106f5079b664a9ceacb77242891e42fa7425115a.tar.gz prosody-106f5079b664a9ceacb77242891e42fa7425115a.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/moduleapi.lua | 2 | ||||
| -rw-r--r-- | core/storagemanager.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index a8e6881e..30360f73 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -338,7 +338,7 @@ function api:load_resource(path, mode) end function api:open_store(name, type) - return storagemanager.open(self.host, name, type); + return storagemanager.open(self.host, name or self.name, type); end return api; diff --git a/core/storagemanager.lua b/core/storagemanager.lua index 36a671be..1c82af6d 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -86,7 +86,7 @@ function open(host, store, typ) if not ret then if err == "unsupported-store" then log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver", - driver_name, store, typ); + driver_name, store, typ or "<nil>"); ret = null_storage_driver; err = nil; end |