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

[mailer.git] / inc / libs / holiday_functions.php

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index a63d334d27bfecfd9346640df3a979a7f29eaefe..079e99af891b2ba58f97a42be5c4edc1d581b474 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 function HOLIDAY_STOP_HOLIDAYS () {
        // Let's find some expired holiday requests...
        $result_stop = SQL_QUERY("SELECT userid, holiday_start, holiday_end, comments
-FROM "._MYSQL_PREFIX."_user_holidays
+FROM `{!MYSQL_PREFIX!}_user_holidays`
 WHERE holiday_end <= UNIX_TIMESTAMP()
 ORDER BY userid", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_stop) > 0) {
@@ -49,11 +49,11 @@ ORDER BY userid", __FILE__, __LINE__);
                $admin = "";
                while (list($uid, $start, $end, $comments) = SQL_FETCHROW($result_stop)) {
                        // Stop holiday
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_holidays` WHERE userid=%s LIMIT 1",
                                array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Unlock account
-                       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);