aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-06 12:21:01 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-06 12:21:01 +0100
commit3b78f8ac621cc16ec089591a1ba7a8f8cbf85026 (patch)
tree6da59d780aac29a56fe51066eb42129e397a1054 /core
parent591707b9103b710636b476ebe5471d61f93850a7 (diff)
parentd64f65005c8f931e44aa8f37a442051983caf4b2 (diff)
downloadprosody-3b78f8ac621cc16ec089591a1ba7a8f8cbf85026.tar.gz
prosody-3b78f8ac621cc16ec089591a1ba7a8f8cbf85026.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r--core/moduleapi.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index de900bf0..fa20c3cd 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -21,7 +21,10 @@ local tonumber, tostring = tonumber, tostring;
local prosody = prosody;
local hosts = prosody.hosts;
-local core_post_stanza = prosody.core_post_stanza;
+
+-- FIXME: This assert() is to try and catch an obscure bug (2013-04-05)
+local core_post_stanza = assert(prosody.core_post_stanza,
+ "prosody.core_post_stanza is nil, please report this as a bug");
-- Registry of shared module data
local shared_data = setmetatable({}, { __mode = "v" });