All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

[mailer.git] / inc / autopurge / purge-inact.php

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 679bd906bc6a52de0203f98fc94bd1d4ad8c6152..65250b8a9d79612788b398b6de1498096a66ef3d 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -67,7 +67,7 @@ if (getConfig('autopurge_inactive') == "Y") {
 
        // Check for all accounts
        $result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online
-FROM `"._MYSQL_PREFIX."_user_data` AS d
+FROM `{!MYSQL_PREFIX!}_user_data` AS d
 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
@@ -91,7 +91,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                        SEND_EMAIL($email, AUTOPURGE_MEMBER_INACTIVE_SUBJECT, $msg);
 
                        // Update this account
-                       SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
                                array(bigintval($uid)), __FILE__, __LINE__);
                } // END - while
 
@@ -109,7 +109,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
        // here for e.g. excluding holiday users
        $time = bigintval(getConfig('ap_in_time'));
        $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
-FROM `"._MYSQL_PREFIX."_user_data` AS d
+FROM `{!MYSQL_PREFIX!}_user_data` AS d
 WHERE status='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY userid",