More code parts could take advantage of previously improved fixEmptyContentToDashes():

[mailer.git] / inc / modules / admin / what-list_user.php

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 70120a8d3f678dfc2a520aec5a4c2382cd766fc0..36fc44e79c3fc8ec2752e6d4a94a273c28c22516 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -53,15 +53,6 @@ if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) {
 $MORE = '';
 $colspan = 4;
 
-// Add nickname if extension is found&active
-// @TODO Rewrite these if-blocks in a filter
-if (isExtensionActive('nickname')) {
-       // Add nickname
-       $MORE .= ", `nickname`";
-} else {
-       $MORE .= ", `userid`";
-}
-
 // Add random confirmed if extension version matches
 if (isExtensionInstalledAndNewer('user', '0.3.4')) {
        // Add it...
@@ -154,19 +145,12 @@ LIMIT 1",
                // Add more data
                $content['own_points']        = $data['points'];
                $content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
-               $content['nickname']          = '{--EXT_NICKNAME_404--}';
 
                // Link to email_details if some are sent
                if ($content['emails_sent'] > 0) {
                        $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
                } // END - if
 
-               // Nickname inclusion?
-               // @TODO Rewrite these to filters
-               if (isExtensionInstalled('nickname')) {
-                       $content['nickname'] = getNickname($content['userid']);
-               } // END - if
-
                // Clickrate
                $content['click_rate'] = '0';
                if ($content['emails_received'] > 0) {
@@ -294,12 +278,6 @@ LIMIT 1",
                                $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
                        } // END - if
 
-                       // Add nickname
-                       $content['nickname'] = '{--EXT_NICKNAME_404--}';
-                       if (isExtensionInstalled('nickname')) {
-                               $content['nickname'] = getNickname($content['userid']);
-                       } // END - if
-
                        // Clickrate
                        $content['rate'] = '0';
                        if ($content['emails_received'] > 0) {