diff options
| author | matthew <matthew@silver> | 2009-09-05 23:01:06 +0100 |
|---|---|---|
| committer | matthew <matthew@silver> | 2009-09-05 23:01:06 +0100 |
| commit | 62ef87bb8fd695c0c63fd07b83dee477d7b365d6 (patch) | |
| tree | 70ae38642101513d0c888d2c7f840a60cf686d0c | |
| parent | b4fa86acea319d65c8866accf38dd870e5d381aa (diff) | |
| parent | c1e71bdec84a2ac4c5ab5bca75854a9e36464612 (diff) | |
| download | prosody-62ef87bb8fd695c0c63fd07b83dee477d7b365d6.tar.gz prosody-62ef87bb8fd695c0c63fd07b83dee477d7b365d6.zip | |
Merge with 0.5
| -rw-r--r-- | core/modulemanager.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_presence.lua | 2 | ||||
| -rw-r--r-- | util/datamanager.lua | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 7037fc90..6bc8e285 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -228,7 +228,7 @@ function reload(host, name, ...) end function handle_stanza(host, origin, stanza) - local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type; + local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns or "jabber:client", origin.type; if name == "iq" and xmlns == "jabber:client" then if stanza.attr.type == "get" or stanza.attr.type == "set" then xmlns = stanza.tags[1].attr.xmlns or "jabber:client"; diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index f78a5950..d696612d 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -29,7 +29,7 @@ function core_route_stanza(origin, stanza) if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then local node, host = jid_split(stanza.attr.to); host = hosts[host]; - if host and host.type == "local" then + if node and host and host.type == "local" then handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); return; end diff --git a/util/datamanager.lua b/util/datamanager.lua index dcc35bb5..4d07d6cc 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -137,7 +137,7 @@ function store(username, host, datastore, data) append(f, data); f:close(); if next(data) == nil then -- try to delete empty datastore - log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host); + log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil"); os_remove(getpath(username, host, datastore)); end -- we write data even when we are deleting because lua doesn't have a @@ -179,7 +179,7 @@ function list_store(username, host, datastore, data) end f:close(); if next(data) == nil then -- try to delete empty datastore - log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host); + log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil"); os_remove(getpath(username, host, datastore, "list")); end -- we write data even when we are deleting because lua doesn't have a |