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

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

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 794862a32fec37397ee918bca1303bf63a679a33..5297de5ad17e3c3bdfd954e8308dca27e243bd1c 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("nickname")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "nickname");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "nickname");
        return;
 }
 
@@ -60,11 +60,11 @@ if (isset($_POST['ok'])) {
 
 if ($VALID) {
        // Look for nickname in database (we only need just one entry so don't worry about the "LIMIT 1" !
-       $result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE nickname='%s' AND userid != '%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND userid != '%s' LIMIT 1",
                array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Nickname not in use, so set it now
-               SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET nickname='%s' WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET nickname='%s' WHERE userid=%s LIMIT 1",
                        array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
                $content = NICKNAME_SAVED;
        } else {
@@ -83,7 +83,7 @@ if ($VALID) {
 
        // Do we have already submit the form?
        if (!empty($_POST['nickname'])) {
-               OUTPUT_HTML("<STRONG class=\"member_failed\">".NICKNAME_IS_INVALID."</STRONG><P></P>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".NICKNAME_IS_INVALID."</div");
        } // END - if
 
        // Load Template