Removed

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

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index fc575fbf3f78209435f39585d312760155658736..3304c010744a2679b7b347e1c845724a1162d027 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -60,9 +60,6 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
 
                // Put it in cache
                $GLOBALS['cache_array']['nick_active'][$uidNick] = (!empty($nick));
-
-               // Free result
-               SQL_FREERESULT($result);
        }
 
        // Return nickname
@@ -81,19 +78,19 @@ function NICKNAME_GET_NICK ($userid) {
 
                // Increment cache counter
                incrementConfigEntry('cache_hits');
-       } elseif (NICKNAME_IS_ACTIVE($userid)) {
+       } else {
                // Init result
                $result = false;
 
                // Nickname or userid used?
-               if (''.round($uidNick).'' === ''.$uidNick.'') {
+               if (''.round($userid).'' === ''.$userid.'') {
                        // Userid given
                        $result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid` =%s LIMIT 1",
-                               array(bigintval($uidNick)), __FUNCTION__, __LINE__);
+                               array(bigintval($userid)), __FUNCTION__, __LINE__);
                } else {
                        // Nickname given
                        $result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' LIMIT 1",
-                               array($uidNick), __FUNCTION__, __LINE__);
+                               array($userid), __FUNCTION__, __LINE__);
                }
 
                // Found?
@@ -113,10 +110,5 @@ function NICKNAME_GET_NICK ($userid) {
        return $ret;
 }
 
-// Simple wrapper function
-function NICKNAME_PROBE_ON_USERID ($uid) {
-       return (NICKNAME_GET_NICK($uid) != '');
-}
-
 //
 ?>