More globals rewritten, see #100

[mailer.git] / inc / modules / member / what-welcome.php

diff --git a/inc/modules/member/what-welcome.php b/inc/modules/member/what-welcome.php
index ce5e843fad2dd867308fb545c8adba4bb86365c4..cb48d773b31d1ca48d4369617c0dc760acbcb2f8 100644 (file)
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -43,23 +43,20 @@ if (!defined('__SECURITY')) {
 ADD_DESCR ("member", basename(__FILE__));
 
 // Export data for template
-define('_LAST_ONLINE_VALUE', MAKE_DATETIME($LAST['online']));
-define('_LAST_MODULE_VALUE', GET_MOD_DESCR("member", $LAST['module']));
+define('_LAST_ONLINE_VALUE', MAKE_DATETIME($GLOBALS['last']['online']));
+define('_LAST_MODULE_VALUE', GET_MOD_DESCR("member", $GLOBALS['last']['module']));
 
 // Load header template
 LOAD_TEMPLATE("member_welcome_header");
 
 // Chedk if he is returning from a profile update notification
-$result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE notified='Y' AND userid=%s LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE notified='Y' AND userid=%s LIMIT 1",
+       array($GLOBALS['userid']), __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("profile")))
-{
+if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("profile"))) {
        // Yes, he is so let's place him his wanted buttons
        LOAD_TEMPLATE("profile-update");
-}
- else
-{
+} else {
        // Load the template below this default data
        LOAD_TEMPLATE("member_welcome");
 }