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

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

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 8b9fe5bcecdaad182f653205a002da7cebd3e79c..c9a44dec6bca6f9b899c0fd8e591ea119b67017b 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -54,7 +54,7 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
        } else {
                // Search in database
                // @TODO Can we replace this with GET_TOTAL_DATA() ?
-               $result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",
                        array(bigintval($uidNick), $uidNick), __FILE__, __LINE__);
 
                // Check existence of nickname
@@ -87,7 +87,7 @@ function NICKNAME_GET_NICK ($userid) {
                incrementConfigEntry('cache_hits');
        } elseif (NICKNAME_IS_ACTIVE($userid)) {
                // Search for non-empty nickname
-               $result = SQL_QUERY_ESC("SELECT nickname FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND nickname != '' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT nickname FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND nickname != '' LIMIT 1",
                        array(bigintval($userid)), __FILE__, __LINE__);
 
                // Found?