Array element fixed

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index d343e5269a145606db2412e6c81d9ef3701bc2ac..f1ff8fe10bee503900719c611631634ddfb51cbb 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -450,7 +450,7 @@ function doNewUserPassword ($email, $userid) {
                                array(generateHash($NEW_PASS), $userid), __FUNCTION__, __LINE__);
 
                        // Prepare data and message for email
-                       $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS), $userid);
+                       $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
 
                        // ... and send it away
                        sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index bf998d8863acf4d0b97d7d1a335b13dfe86e7492..f986bd30e8e7022c66dd8bdcf157686cdc6be822 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -138,7 +138,7 @@ LIMIT 1",
                                // @TODO Rewrite these all constants
                                $content['email']   = generateEmailLink($DATA['email'], 'user_data');
                                $content['surname'] = $DATA['surname'];
-                               $content['fname']   = $DATA['family'];
+                               $content['family']  = $DATA['family'];
                                $content['userid']  = bigintval(getRequestElement('userid'));
 
                                // Realy want to lock?