aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-04-19 14:44:08 +0200
committerKim Alvefur <zash@zash.se>2013-04-19 14:44:08 +0200
commit7468a4e6be2e73122272dc88b63b931ac0fa5c0b (patch)
tree7dfc363e6ecf609a3504e70e9d87d2da74c8f49f
parentbc2cf7ee1976a358b1bead2fb047e71576b66d10 (diff)
parent10e527173b98b7a479df576145e80afb6f3da6fb (diff)
downloadprosody-7468a4e6be2e73122272dc88b63b931ac0fa5c0b.tar.gz
prosody-7468a4e6be2e73122272dc88b63b931ac0fa5c0b.zip
Merge 0.9->trunk
-rw-r--r--core/moduleapi.lua2
1 files changed, 1 insertions, 1 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;