Merge with backout

[prosody.git] / plugins / mod_welcome.lua

diff --git a/plugins/mod_welcome.lua b/plugins/mod_welcome.lua
index e9444363d2cff91dfa4d50438237ecd97cdd418d..8f92010a013d7279bac927f178f4651ce0901820 100644 (file)
--- a/plugins/mod_welcome.lua
+++ b/plugins/mod_welcome.lua
@@ -1,15 +1,13 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
 --
 
-local config = require "core.configmanager";
-
 local host = module:get_host();
-local welcome_text = config.get("*", "core", "welcome_message") or "Hello $username, welcome to the $host IM server!";
+local welcome_text = module:get_option("welcome_message") or "Hello $username, welcome to the $host IM server!";
 
 local st = require "util.stanza";