Merge 0.10->trunk

[prosody.git] / plugins / mod_lastactivity.lua

diff --git a/plugins/mod_lastactivity.lua b/plugins/mod_lastactivity.lua
index 11053709bc0b99239ab21ce3bd7d080541a48a79..2dd61699999dcf5a56fb44dd62a5f0b4514ffe22 100644 (file)
--- a/plugins/mod_lastactivity.lua
+++ b/plugins/mod_lastactivity.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -19,8 +19,7 @@ module:hook("pre-presence/bare", function(event)
        local stanza = event.stanza;
        if not(stanza.attr.to) and stanza.attr.type == "unavailable" then
                local t = os.time();
-               local s = stanza:child_with_name("status");
-               s = s and #s.tags == 0 and s[1] or "";
+               local s = stanza:get_child_text("status");
                map[event.origin.username] = {s = s, t = t};
        end
 end, 10);