[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] mail: Use the Real Name in various user notification emails, if enabled

Jonny Bradley pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
af63c816 by Jonny Bradley at 2026-09-01T15:27:37+00:00
[FIX] mail: Use the Real Name in various user notification emails, if enabled
---
* [FIX] Typo (thanks @luciash again ;)

* [FIX] mail: Use the Real Name in various user notification emails, if enabled

See merge request tikiwiki/tiki!11062

- - - - -


6 changed files:

- lib/userslib.php
- templates/mail/convene_vote_result.tpl
- templates/mail/moderate_activation_mail.tpl
- templates/mail/moderate_validation_mail.tpl
- templates/mail/password_reminder.tpl
- templates/mail/user_validation_mail.tpl


Changes:

=====================================
lib/userslib.php
=====================================
@@ -8246,6 +8246,9 @@ class UsersLib extends TikiLib
             )
         );
 
+        // falls back to login if not enabled
+        $smarty->assign('mail_realname', $this->clean_user($name));
+
         include_once('lib/webmail/tikimaillib.php');
 
         if ($second == 'y') {


=====================================
templates/mail/convene_vote_result.tpl
=====================================
@@ -1,4 +1,4 @@
-{tr}Hi{/tr} {$mail_user},
+{tr}Hi{/tr} {$mail_realname},
 
 {tr _0=$vote_result}There was %0 on the vote.{/tr} ({$mail_site}).
 


=====================================
templates/mail/moderate_activation_mail.tpl
=====================================
@@ -1,4 +1,4 @@
-{tr}Hi{/tr} {$mail_user},
+{tr}Hi{/tr} {$mail_realname},
 {tr _0=$prefs.mail_template_custom_text _1=$mail_site}Your %0account registration request for %1 was validated by the site admin and your account is active now.{/tr}
 
 {tr}To login with your username and password, please follow this link:{/tr}


=====================================
templates/mail/moderate_validation_mail.tpl
=====================================
@@ -1,4 +1,4 @@
-{tr}Hi,{/tr}
+{tr}Hi{/tr} {$mail_realname},
 
 {if $mail_again}
 {tr _0=$mail_user _1=$mail_email _2=$mail_site _3=$prefs.mail_template_custom_text}%0 <%1> has requested a new password on %2, but you need to validate his %3 account first{/tr}


=====================================
templates/mail/password_reminder.tpl
=====================================
@@ -1,4 +1,4 @@
-{tr}Hi{/tr} {$mail_user},
+{tr}Hi{/tr} {$mail_realname},
 
 {tr _0=$prefs.mail_template_custom_text}Someone requested a password reset for your %0account{/tr} ({$mail_site}).
 


=====================================
templates/mail/user_validation_mail.tpl
=====================================
@@ -1,4 +1,4 @@
-{tr}Hi{/tr} {$mail_user},
+{tr}Hi{/tr} {$mail_realname},
 
 {tr}You or someone registered this email address at{/tr} {$mail_site}
 {tr _0=$prefs.mail_template_custom_text}If you want to be a registered user in this %0site you will have to use the following link to login for the first time:{/tr}



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/af63c81650c956e125c24e7e2d8c6bf065575ff3

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/af63c81650c956e125c24e7e2d8c6bf065575ff3
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs