Merge 0.7->trunk

[prosody.git] / plugins / mod_console.lua

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 4180e2b62543af2fe51dd778bff70773cdf4546b..e87ef536158cf39afb295406fcd929cdcc6dfa5a 100644 (file)
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -85,9 +85,10 @@ function console_listener.onincoming(conn, data)
 
                session.env._ = data;
                
-               local chunk, err = loadstring("return "..data);
+               local chunkname = "=console";
+               local chunk, err = loadstring("return "..data, chunkname);
                if not chunk then
-                       chunk, err = loadstring(data);
+                       chunk, err = loadstring(data, chunkname);
                        if not chunk then
                                err = err:gsub("^%[string .-%]:%d+: ", "");
                                err = err:gsub("^:%d+: ", "");