Next wave of lesser getMessage() usage and more EL

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 6fa424a99f40ce63c2b3baff3319f14a75ef3da7..517f0ebdd3bac261128c507becdce894c5515509 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -101,7 +101,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
        elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode');
 
        // Makes order by links..
-       if ($letter == 'front') $letter = getMessage('_ALL2');
+       if ($letter == 'front') $letter = '{--_ALL2--}';
 
        // Prepare array with all possible sorters
        $list = array(
@@ -113,7 +113,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 
        // Add nickname if extension is installed
        if (isExtensionActive('nickname')) {
-               $list['nickname'] = getMessage('NICKNAME');
+               $list['nickname'] = '{--NICKNAME--}';
        } // END - if
 
        foreach ($list as $sort => $title) {
@@ -184,8 +184,9 @@ function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=fal
                if ($page < $numPages) $OUT .= '|';
        } // END - for
 
-       // Remember the list
-       $content['list'] = $OUT;
+       // Remember the list and colspan
+       $content['list']     = $OUT;
+       $content['colspan2'] = $colspan;
 
        // Load template
        $OUT = loadTemplate('admin_list_user_pagenav', true, $content);
@@ -455,7 +456,7 @@ function doNewUserPassword ($email, $userid) {
                        sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
 
                        // Output note to user
-                       loadTemplate('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));
+                       loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
                } else {
                        // Account is locked or unconfirmed
                        $errorCode = generateErrorCodeFromUserStatus($status);