isNicknameUsed() does no longer check for ext-nickname

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 5ebcaebce1fc5211496031264048ccf9a9deb519..fc03e66c9f603d03f232dc3497ff30c0771294a1 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -439,7 +439,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
        //* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content).'<br />');
        if (($UID > 0) && (is_array($content))) {
                // If nickname extension is installed, fetch nickname as well
-               if (isNicknameUsed($UID)) {
+               if ((isExtensionActive('nickname')) && (isNicknameUsed($UID))) {
                        //* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />");
                        // Load by nickname
                        fetchUserData($UID, 'nickname');
@@ -3181,7 +3181,7 @@ function determineReferalId () {
                $found = false;
 
                // Do we have nickname or userid set?
-               if (isNicknameUsed($GLOBALS['refid'])) {
+               if ((isExtensionActive('nickname')) && (isNicknameUsed($GLOBALS['refid']))) {
                        // Nickname in URL, so load the id
                        $found = fetchUserData($GLOBALS['refid'], 'nickname');
                } elseif ($GLOBALS['refid'] > 0) {