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
commitd3aa2851d328cbcd3c9660b945c7acae71657a89 (patch)
tree6da59d780aac29a56fe51066eb42129e397a1054 /core
parentdcd474ce5ebb61668046c1fdc3ac8fa9a4f88b8c (diff)
parent94eebdf657db32ddca636e3cd83b335682c671e0 (diff)
downloadprosody-d3aa2851d328cbcd3c9660b945c7acae71657a89.tar.gz
prosody-d3aa2851d328cbcd3c9660b945c7acae71657a89.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" });